Solved shellcheck hints

This commit is contained in:
Kevin Veen-Birkenbach 2020-05-06 08:59:48 +02:00
parent d76f0114ec
commit ab176c51b2
3 changed files with 9 additions and 8 deletions

View File

@ -18,7 +18,7 @@ get_packages "general" "client/pacman/general" "client/pacman/games" | sudo pacm
info "Synchronizing yay packages..." info "Synchronizing yay packages..."
for package in $(get_packages "client/yay/general"); do for package in $(get_packages "client/yay/general"); do
if [ "$(pacman -Qi $package 2> /dev/null)" ]; then if [ "$(pacman -Qi "$package" 2> /dev/null)" ]; then
info "Package \"$package\" is allready installed. Skipped installation." info "Package \"$package\" is allready installed. Skipped installation."
else else
info "Install package \"$package\" with yay..." info "Install package \"$package\" with yay..."
@ -116,26 +116,26 @@ install_gnome_extension(){
fi fi
else else
info "Install..." && info "Install..." &&
git clone $2 "$extension_folder" || error "Failed." git clone "$2" "$extension_folder" || error "Failed."
fi fi
if [ -f "$extension_folder""Makefile" ]; if [ -f "$extension_folder""Makefile" ];
then then
tmp_extension_folder="/tmp/$1" tmp_extension_folder="/tmp/$1"
mv $extension_folder $tmp_extension_folder mv "$extension_folder" "$tmp_extension_folder"
info "Compilling extension.." info "Compilling extension.."
(cd $tmp_extension_folder && make install) || error "Compilation with failed." (cd "$tmp_extension_folder" && make install) || error "Compilation with failed."
info "Cleaning up tmp-extension folder..."&& info "Cleaning up tmp-extension folder..."&&
rm -fr $tmp_extension_folder || error "Failed." rm -fr "$tmp_extension_folder" || error "Failed."
else else
info "No Makefile found. Skipping compilation..." info "No Makefile found. Skipping compilation..."
fi fi
info "Activating GNOME extension \"$1\"..." && info "Activating GNOME extension \"$1\"..." &&
gnome-extensions enable $1 || error "Failed." gnome-extensions enable "$1" || error "Failed."
} }
if [ "$DESKTOP_SESSION" == "gnome" ]; then if [ "$DESKTOP_SESSION" == "gnome" ]; then

View File

@ -5,6 +5,7 @@
# #
# shellcheck source=/dev/null # Deactivate SC1090 # shellcheck source=/dev/null # Deactivate SC1090
# shellcheck disable=SC2143 # Comparing with -z allowed # shellcheck disable=SC2143 # Comparing with -z allowed
# shellcheck disable=SC2015 # Deactivating bool hint
source "$(dirname "$(readlink -f "${0}")")/../base.sh" || (echo "Loading base.sh failed." && exit 1) source "$(dirname "$(readlink -f "${0}")")/../base.sh" || (echo "Loading base.sh failed." && exit 1)
if [ -z "$(mount | grep "$DECRYPTED_PATH")" ] if [ -z "$(mount | grep "$DECRYPTED_PATH")" ]
then then

View File

@ -5,11 +5,11 @@ info "Actual mounted devices:"
echo echo
ls -lasi /dev/ | grep -E "sd|mm" ls -lasi /dev/ | grep -E "sd|mm"
echo echo
while [ \! -b "$ifi" ] while [ ! -b "$ifi" ]
do do
info "Please select the correct device." info "Please select the correct device."
question "/dev/:" question "/dev/:"
read device read -r device
ifi="/dev/$device" ifi="/dev/$device"
done done
while [ "$path" == "" ] while [ "$path" == "" ]