diff --git a/scripts/client/setup.sh b/scripts/client/setup.sh
index 4c568c1..f5f3cfc 100644
--- a/scripts/client/setup.sh
+++ b/scripts/client/setup.sh
@@ -152,7 +152,7 @@ install_gnome_extension(){
 
 if [ "$DESKTOP_SESSION" == "gnome" ]; then
   info "Synchronizing gnome tools..." &&
-  sudo pacman -S $(get_packages "client/pacman/gnome") || error "Syncronisation failed."
+  sudo pacman -S "$(get_packages 'client/pacman/gnome')" || error "Syncronisation failed."
 	info "Setting up gnome dash favourites..." &&
 	gsettings set org.gnome.shell favorite-apps "['org.gnome.Nautilus.desktop',
 	'org.gnome.Terminal.desktop',
diff --git a/scripts/data/export-to-system.sh b/scripts/data/export-to-system.sh
index 1daa464..852cdf4 100644
--- a/scripts/data/export-to-system.sh
+++ b/scripts/data/export-to-system.sh
@@ -2,10 +2,12 @@
 # Executes the import script in reverse mode
 # @author Kevin Veen-Birkenbach [aka. Frantz]
 # shellcheck source=/dev/null # Deactivate SC1090
+# shellcheck disable=SC2015  # Deactivating bool hint
 source "$(dirname "$(readlink -f "${0}")")/../base.sh" || (echo "Loading base.sh failed." && exit 1)
 bash "$SCRIPT_PATH""data/import-from-system.sh" reverse
-info "Setting right permissions for importet files..."
-chown -R $USER:$USER ~
-chmod -R 700 ~/.ssh
-chmod 600 ~/.ssh/id_rsa
-chmod 600 ~/.ssh/id_rsa.pub
+info "Setting right permissions for importet files..." &&
+chown -R "$USER":"$USER" ~ &&
+chmod -R 700 ~/.ssh &&
+chmod 600 ~/.ssh/id_rsa &&
+chmod 600 ~/.ssh/id_rsa.pub ||
+error