luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: More fixes

Browse source
This commit is contained in:
Anmol Sethi 2022-11-14 13:18:31 -08:00
parent 70a80fa36b
commit 9e64d79e10
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ci/release/gen_install.sh
View file

@ -3,8 +3,8 @@ set -eu
cd -- "$(dirname "$0")/../.." cd -- "$(dirname "$0")/../.."
. ./ci/sub/lib.sh . ./ci/sub/lib.sh
chmod +w ./install.sh sh_c chmod +w ./install.sh
cat >./install.sh <<EOF sh_c cat >./install.sh <<EOF
#!/bin/sh #!/bin/sh
set -eu set -eu
@ -36,4 +36,4 @@ sh_c cat \
\| sed "-e'/^\. /d'" \>\> ./install.sh \| sed "-e'/^\. /d'" \>\> ./install.sh
sh_c cat ./ci/release/_install.sh \ sh_c cat ./ci/release/_install.sh \
\| sed -n "'/cd -- \"\$(dirname/,/cd -/!p'" \>\> install.sh \| sed -n "'/cd -- \"\$(dirname/,/cd -/!p'" \>\> install.sh
chmod -w install.sh sh_c chmod -w install.sh

2
ci/sub

@ -1 +1 @@
Subproject commit db0f045304ba1d69b85043d02c76891b75be6f0e Subproject commit c81d4e0abbc8b8b86d67a4a9fde7c55be99a4aa9

6
install.sh
View file

@ -149,7 +149,7 @@ logf() {
} }
logcat() { logcat() {
COLOR=5 catp log "$@" >&2 COLOR=5 logpcat log "$@"
} }
warn() { warn() {
@ -191,12 +191,12 @@ header() {
} }
# humanpath replaces all occurrences of " $HOME" with " ~" # 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() { humanpath() {
if [ -z "${HOME-}" ]; then if [ -z "${HOME-}" ]; then
cat cat
else else
sed -e "s# $HOME# ~#g" -e "s#\"$HOME#\"\$HOME#g" sed -e "s# $HOME# ~#g" -e "s#$HOME#\$HOME#g"
fi fi
} }