a
/
code-server-2
mirror of https://git.tuxpa.in/a/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify getting the absolute path during build

This commit is contained in:
Asher 2019-08-21 14:13:26 -05:00
parent c19223b7fe
commit 950dad9489
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/tasks.bash
View File

@ -190,21 +190,12 @@ function binary-task() {
log "Binary: ${buildPath}/${binaryName}" log "Binary: ${buildPath}/${binaryName}"
} }
function absolute-path() {
local relative="${1}"; shift
if command -v realpath &> /dev/null ; then
realpath "${relative}"
else
readlink -f "${relative}"
fi
}
# Check if it looks like we are inside VS Code. # Check if it looks like we are inside VS Code.
function in-vscode () { function in-vscode () {
local dir="${1}" ; shift local dir="${1}" ; shift
local maybeVsCode local maybeVsCode
local dirName local dirName
maybeVsCode="$(absolute-path "${dir}/../../..")" maybeVsCode="$(cd "${dir}/../../.." ; pwd -P)"
dirName="$(basename "${maybeVsCode}")" dirName="$(basename "${maybeVsCode}")"
if [[ "${dirName}" != "vscode" ]] ; then if [[ "${dirName}" != "vscode" ]] ; then
return 1 return 1
@ -219,10 +210,8 @@ function in-vscode () {
} }
function main() { function main() {
local relativeRootPath
local rootPath local rootPath
relativeRootPath="$(dirname "${0}")/.." rootPath="$(cd "$(dirname "${0}/..")" ; pwd -P)"
rootPath="$(absolute-path "${relativeRootPath}")"
local task="${1}" ; shift local task="${1}" ; shift
if [[ "${task}" == "ensure-in-vscode" ]] ; then if [[ "${task}" == "ensure-in-vscode" ]] ; then