zshrc: update PATH generation

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index fbe8f1f0762cdab640145d5afa701d0adba16362..b28eb8138f758a567ce92a4494552e718ee3632e 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -19,11 +19,11 @@ cache="${XDG_CACHE_HOME#$DEST/}"
 
 # test
 devnull=/dev/null
 
 # test
 devnull=/dev/null

-if [ "$1" = "test" ]; then
+if [ "${DOTFILES_TEST+x}" = x ]; then

     echo "Running test -- no changes will be applied"
     devnull=/dev/stdout
     _cd() {
     echo "Running test -- no changes will be applied"
     devnull=/dev/stdout
     _cd() {

-        echo "-- cd $* --> $PWD";
+        echo "-- cd $PWD --> $*";

         cd $*;
     }
     alias cd="_cd"
         cd $*;
     }
     alias cd="_cd"


@@ -69,7 +69,7 @@ find . "$share" "$etc" \
      -xdev -mindepth 1 -maxdepth 1 -type l -exec sh -c '
        r="$(realpath "{}")"
        [ "${r#'"$SRC"'/}" != "$r" ] &&
      -xdev -mindepth 1 -maxdepth 1 -type l -exec sh -c '
        r="$(realpath "{}")"
        [ "${r#'"$SRC"'/}" != "$r" ] &&

-         '"$([ "$1" = test ] && echo 'echo +++ ')"'unlink "{}"' \;
+         '"$([ "${DOTFILES_TEST+x}" = x ] && echo 'echo +++ ')"'unlink "{}"' \;

 
 cd "$SRC" >$devnull
 
 
 cd "$SRC" >$devnull
 


@@ -98,7 +98,7 @@ find gui -mindepth 1 -maxdepth 1 | while read -r y; do
             done
             ;;
         fonts)
             done
             ;;
         fonts)

-            find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do
+            find "$y" -mindepth 2 -maxdepth 2 -type d | while read -r x; do

                 command -v mkfontscale >$devnull 2>&1 && mkfontscale "$x"
                 command -v mkfontdir >$devnull 2>&1 && mkfontdir "$x"
                 [ "$(head -1 "$x/fonts.scale" >$devnull 2>&1)" = 0 ] &&
                 command -v mkfontscale >$devnull 2>&1 && mkfontscale "$x"
                 command -v mkfontdir >$devnull 2>&1 && mkfontdir "$x"
                 [ "$(head -1 "$x/fonts.scale" >$devnull 2>&1)" = 0 ] &&


@@ -146,7 +146,7 @@ if command -v librewolf >$devnull 2>&1; then
     if [ -f "$profiles" ]; then
         find librewolf/chrome -mindepth 1 -maxdepth 1 -type f | while read -r x; do
                      # vv arcane bullshit vv
     if [ -f "$profiles" ]; then
         find librewolf/chrome -mindepth 1 -maxdepth 1 -type f | while read -r x; do
                      # vv arcane bullshit vv

-            sed -En 's/^Path=(.+)/\1/;Tx;p;:x' "$profiles" | while read -r y; do
+            sed -En 's/^Path=(.+)/\1/;T;p' "$profiles" | while read -r y; do

                 # ignore profiles that are most likely unused
                 # TODO: actually check profiles.ini
                 profile="$DEST/.librewolf/$y"
                 # ignore profiles that are most likely unused
                 # TODO: actually check profiles.ini
                 profile="$DEST/.librewolf/$y"