diff --git a/ci/release/gen_install.sh b/ci/release/gen_install.sh index de8f37431..082bdcc52 100755 --- a/ci/release/gen_install.sh +++ b/ci/release/gen_install.sh @@ -3,8 +3,8 @@ set -eu cd -- "$(dirname "$0")/../.." . ./ci/sub/lib.sh -chmod +w ./install.sh -cat >./install.sh <./install.sh <\> ./install.sh sh_c cat ./ci/release/_install.sh \ \| sed -n "'/cd -- \"\$(dirname/,/cd -/!p'" \>\> install.sh -chmod -w install.sh +sh_c chmod -w install.sh diff --git a/ci/sub b/ci/sub index db0f04530..c81d4e0ab 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit db0f045304ba1d69b85043d02c76891b75be6f0e +Subproject commit c81d4e0abbc8b8b86d67a4a9fde7c55be99a4aa9 diff --git a/install.sh b/install.sh index 77a8f8151..4c45780da 100755 --- a/install.sh +++ b/install.sh @@ -149,7 +149,7 @@ logf() { } logcat() { - COLOR=5 catp log "$@" >&2 + COLOR=5 logpcat log "$@" } warn() { @@ -191,12 +191,12 @@ header() { } # humanpath replaces all occurrences of " $HOME" with " ~" -# and all occurrences of '"$HOME' with the literal '"$HOME'. +# and all occurrences of '$HOME' with the literal '$HOME'. humanpath() { if [ -z "${HOME-}" ]; then cat else - sed -e "s# $HOME# ~#g" -e "s#\"$HOME#\"\$HOME#g" + sed -e "s# $HOME# ~#g" -e "s#$HOME#\$HOME#g" fi }