From 03303c9e36b81ad6bae3bb84ec3a173dc7d79705 Mon Sep 17 00:00:00 2001 From: Sam Hardeman Date: Mon, 22 Sep 2025 11:55:19 +0200 Subject: [PATCH] Tabs to two spaces. --- cdz | 58 ++++++++++++++++++++++++++-------------------------- daisy.source | 2 +- filewait | 2 +- newday | 2 +- shrc | 26 +++++++++++------------ sw | 8 ++++---- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/cdz b/cdz index 383b44e..18095b8 100755 --- a/cdz +++ b/cdz @@ -55,42 +55,42 @@ then fi if [[ $NO_ARCHIVEMOUNT -eq 1 ]]; then - hasmounter=1 + hasmounter=1 fi if (( $hasmounter == 0 )); then - echo "We have \`archivemount\`, so we'll use that!" - echo "If you'd prefer we not use it, please specify NO_ARCHIVEMOUNT=1" - istar=1 - iszip=1 - israr=1 + echo "We have \`archivemount\`, so we'll use that!" + echo "If you'd prefer we not use it, please specify NO_ARCHIVEMOUNT=1" + istar=1 + iszip=1 + israr=1 fi # Now we set the right command if (( $istar == 0 )); then - comm2=(tar xvf "$target" -C) + comm2=(tar xvf "$target" -C) elif (( $iszip == 0 )); then - which unzip 1>/dev/null - exitcode=$? - if (( $exitcode == 0 )); then - comm2=(unzip -q "$target" -d) - else - comm1=(echo "The utility 'unzip' is missing, please install it") - comm3=(exit 1) - fi + which unzip 1>/dev/null + exitcode=$? + if (( $exitcode == 0 )); then + comm2=(unzip -q "$target" -d) + else + comm1=(echo "The utility 'unzip' is missing, please install it") + comm3=(exit 1) + fi elif (( $israr == 0 )); then - which unrar 1>/dev/null - exitcode=$? - if (( exitcode == 0 )); then - comm2=(unrar -i nul "$target") - else - comm1=(echo "The utility 'unrar' is missing, please install it") - comm3=(exit 1) - fi + which unrar 1>/dev/null + exitcode=$? + if (( exitcode == 0 )); then + comm2=(unrar -i nul "$target") + else + comm1=(echo "The utility 'unrar' is missing, please install it") + comm3=(exit 1) + fi elif (( $hasmounter == 0 )); then - comm2=(archivemount "$target") - comm4=(cd ..) - comm5=(umount) + comm2=(archivemount "$target") + comm4=(cd ..) + comm5=(umount) fi # Create the temp dir, usually @@ -106,9 +106,9 @@ cd $dir # With archivemount, making a symlink will alter the archive if (( $hasmounter == 1 )); then - ln -s $currentpath ./link-back - echo "A symlink to your original path has been created under the name \`link-back\`." - echo "You can use this to copy out files, but you can also just access your filesystem regularly." + ln -s $currentpath ./link-back + echo "A symlink to your original path has been created under the name \`link-back\`." + echo "You can use this to copy out files, but you can also just access your filesystem regularly." fi echo "Type 'exit' to exit the extracted archive's folder and auto-delete it." diff --git a/daisy.source b/daisy.source index 743a6f3..d8e6c14 100755 --- a/daisy.source +++ b/daisy.source @@ -231,7 +231,7 @@ function ched() then if [[ $(realpath "$EDITOR") == "$EDITOR_REAL" ]]; then - available_editors+=("$EDITOR_REAL" "$editor (current choice)") + available_editors+=("$EDITOR_REAL" "$editor (current choice)") else available_editors+=("$EDITOR_REAL", "$editor") fi diff --git a/filewait b/filewait index 9f90672..a5b275a 100755 --- a/filewait +++ b/filewait @@ -7,6 +7,6 @@ DAISY_INTERNAL=1 FILE=$@ while [ ! -f "$FILE" ] do - sleep 0.1 + sleep 0.1 done echo $FILE diff --git a/newday b/newday index 22ba633..cbe7bbb 100755 --- a/newday +++ b/newday @@ -38,7 +38,7 @@ function errorFn() echo "$BINSELF error ($ERROR): " perl -E 'say $!=shift' $ERROR fi - exit $ERROR + exit $ERROR } # Error handling diff --git a/shrc b/shrc index c948629..5c8f86e 100755 --- a/shrc +++ b/shrc @@ -19,21 +19,21 @@ function md5_opt() } if [[ $FROM_RC -eq 1 ]]; then - alias shrc=". shrc" + alias shrc=". shrc" else - BASENAME=$(basename $SHELL) - RC_NAME="."$BASENAME"rc" - RC_PATH="$HOME/$RC_NAME" + BASENAME=$(basename $SHELL) + RC_NAME="."$BASENAME"rc" + RC_PATH="$HOME/$RC_NAME" - # Optional MD5 checks - HAS_CHANGED=1 - SUM1=$(md5_opt "$RC_PATH") - SUM2= + # Optional MD5 checks + HAS_CHANGED=1 + SUM1=$(md5_opt "$RC_PATH") + SUM2= - # This sets a default if the variable does not exist. - EDITOR=${EDITOR:-$(ched)} - $EDITOR "$RC_PATH" - wait_for_editor $EDITOR "$RC_PATH" + # This sets a default if the variable does not exist. + EDITOR=${EDITOR:-$(ched)} + $EDITOR "$RC_PATH" + wait_for_editor $EDITOR "$RC_PATH" SUM2=$(md5_opt "$RC_PATH") @@ -42,6 +42,6 @@ else echo "The RC-file $RC_NAME has not changed on disk. Not sourcing." return fi - + source "$RC_PATH" fi diff --git a/sw b/sw index 00f3573..488c6d3 100755 --- a/sw +++ b/sw @@ -17,16 +17,16 @@ function helpFn() fi echo "Usage: $DAISY_BIN " echo Swap two files in a filesystem. - exit $ERROR + exit $ERROR } if [[ $@ == *"--help"* ]]; then - helpFn + helpFn elif [[ $@ == '' ]]; then - echo "No arguments specified." - helpFn + echo "No arguments specified." + helpFn fi # We set a trap here, together with 'set -e' above,