mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-10-06 17:12:50 +00:00
Enquote more command output in bootstrap to prevent spaces in paths from breaking things.
This commit is contained in:
1 parent
57e1431e1a
commit
51deaf4552
1 file changed
+4
-4
+4
-4
@@ -163,16 +163,16 @@ unset SEALVL
|
||||
PATH_SAVED="$PATH"
|
||||
|
||||
if which "narwhal" > /dev/null; then
|
||||
narwhal_path=$(which "narwhal")
|
||||
narwhal_path="$(which narwhal)"
|
||||
# resolve symlinks
|
||||
while [ -h "$narwhal_path" ]; do
|
||||
dir=$(dirname -- "$narwhal_path")
|
||||
sym=$(readlink -- "$narwhal_path")
|
||||
narwhal_path=$(cd -- "$dir" && cd -- $(dirname -- "$sym") && pwd)/$(basename -- "$sym")
|
||||
narwhal_path="$(cd -- "$dir" && cd -- $(dirname -- "$sym") && pwd)/$(basename -- "$sym")"
|
||||
done
|
||||
|
||||
# NARWHAL_HOME is the 2nd ancestor directory of this shell script
|
||||
dir=$(dirname -- "$(dirname -- "$narwhal_path")")
|
||||
dir="$(dirname -- "$(dirname -- "$narwhal_path")")"
|
||||
|
||||
ask_remove_dir "$dir"
|
||||
else
|
||||
@@ -261,7 +261,7 @@ if ! which "narwhal" > /dev/null; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
install_directory=$(dirname -- "$(dirname -- "$(which narwhal)")")
|
||||
install_directory="$(dirname -- "$(dirname -- "$(which narwhal)")")"
|
||||
|
||||
echo "================================================================================"
|
||||
echo "Using Narwhal installation at \"$install_directory\". Is this correct?"
|
||||
|
||||
Reference in new issue
Block a user