Tabs to two spaces.

This commit is contained in:
Sam Hardeman 2025-09-22 11:55:19 +02:00
parent 0912f2d3d4
commit 03303c9e36
6 changed files with 49 additions and 49 deletions

58
cdz
View file

@ -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."

View file

@ -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

View file

@ -7,6 +7,6 @@ DAISY_INTERNAL=1
FILE=$@
while [ ! -f "$FILE" ]
do
sleep 0.1
sleep 0.1
done
echo $FILE

2
newday
View file

@ -38,7 +38,7 @@ function errorFn()
echo "$BINSELF error ($ERROR): "
perl -E 'say $!=shift' $ERROR
fi
exit $ERROR
exit $ERROR
}
# Error handling

26
shrc
View file

@ -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

8
sw
View file

@ -17,16 +17,16 @@ function helpFn()
fi
echo "Usage: $DAISY_BIN <file1> <file2>"
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,