From 3e8e9163e27f2bb6bda00dd24d23d3b7a1a5fa61 Mon Sep 17 00:00:00 2001
From: "Kevin Veen-Birkenbach [aka. Frantz]" <kevin@veen.world>
Date: Fri, 2 Oct 2020 13:58:04 +0200
Subject: [PATCH] Solved shellcheck hints

---
 scripts/image/setup.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/image/setup.sh b/scripts/image/setup.sh
index bc6f57c..8a5b647 100644
--- a/scripts/image/setup.sh
+++ b/scripts/image/setup.sh
@@ -413,7 +413,7 @@ if [ "$encrypt_system" == "y" ]
     echo "pacman --noconfirm -S --needed $(get_packages "server/luks")" | chroot "$root_mount_path" /bin/bash &&
 
     dropbear_root_key_path="$root_mount_path""etc/dropbear/root_key" &&
-    info "Adding "$target_authorized_keys" to dropbear..." &&
+    info "Adding $target_authorized_keys to dropbear..." &&
     cp -v "$target_authorized_keys" "$dropbear_root_key_path" &&
 
     #Concerning mkinitcpio warning @see https://gist.github.com/imrvelj/c65cd5ca7f5505a65e59204f5a3f7a6d
@@ -425,21 +425,21 @@ if [ "$encrypt_system" == "y" ]
     mkinitcpio_replace_binaries=$(echo "BINARIES=(/usr/lib/libgcc_s.so.1)"| sed -e 's/[\/&]/\\&/g') &&
     mkinitcpio_search_hooks="HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)" &&
     mkinitcpio_replace_hooks="HOOKS=(base udev autodetect modconf block sleep netconf dropbear encryptssh filesystems keyboard fsck)" &&
-    sed -i "s/$mkinitcpio_search_modules/$mkinitcpio_replace_modules/g" $mkinitcpio_path &&
-    sed -i "s/$mkinitcpio_search_binaries/$mkinitcpio_replace_binaries/g" $mkinitcpio_path &&
-    sed -i "s/$mkinitcpio_search_hooks/$mkinitcpio_replace_hooks/g" $mkinitcpio_path &&
+    sed -i "s/$mkinitcpio_search_modules/$mkinitcpio_replace_modules/g" "$mkinitcpio_path" &&
+    sed -i "s/$mkinitcpio_search_binaries/$mkinitcpio_replace_binaries/g" "$mkinitcpio_path" &&
+    sed -i "s/$mkinitcpio_search_hooks/$mkinitcpio_replace_hooks/g" "$mkinitcpio_path" &&
     echo "Content of $mkinitcpio_path:$(cat "$mkinitcpio_path")" &&
     info "Generating mkinitcpio..." &&
     echo "mkinitcpio -vP || exit 1" | chroot "$root_mount_path" /bin/bash &&
 
     fstab_path="$root_mount_path""etc/fstab" &&
     info "Configuring $fstab_path..." &&
-    echo "UUID=$root_partition_uuid  / ext4    defaults,noatime  0  1" >> $fstab_path &&
+    echo "UUID=$root_partition_uuid  / ext4    defaults,noatime  0  1" >> "$fstab_path" &&
     echo "Content of $fstab_path:$(cat "$fstab_path")" &&
 
     crypttab_path="$root_mount_path""etc/crypttab" &&
     info "Generating $crypttab_path..." &&
-    echo "$root_mapper_name UUID=$root_partition_uuid none luks" >> $crypttab_path &&
+    echo "$root_mapper_name UUID=$root_partition_uuid none luks" >> "$crypttab_path" &&
     echo "Content of $crypttab_path:$(cat "$crypttab_path")" &&
 
     #boot.txt just works with raspberry pi 3 @todo Needs to be implemented for arch raspbery pi 4
@@ -448,8 +448,8 @@ if [ "$encrypt_system" == "y" ]
     boot_txt_delete_line=$(echo "part uuid \${devtype} \${devnum}:2 uuid" | sed -e 's/[]\/$*.^[]/\\&/g') &&
     boot_txt_setenv_origin=$(echo "setenv bootargs console=ttyS1,115200 console=tty0 root=PARTUUID=\${uuid} rw rootwait smsc95xx.macaddr=\"\${usbethaddr}\"" | sed -e 's/[]\/$*.^[]/\\&/g') &&
     boot_txt_setenv_replace=$(echo "setenv bootargs console=ttyS1,115200 console=tty0 ip=::::$target_hostname:eth0:dhcp cryptdevice=UUID=$root_partition_uuid:$root_mapper_name root=$root_mapper_path rw rootwait smsc95xx.macaddr=\"\${usbethaddr}\""| sed -e 's/[\/&]/\\&/g') &&
-    sed -i "s/$boot_txt_delete_line//g" $boot_txt_path &&
-    sed -i "s/$boot_txt_setenv_origin/$boot_txt_setenv_replace/g" $boot_txt_path &&
+    sed -i "s/$boot_txt_delete_line//g" "$boot_txt_path" &&
+    sed -i "s/$boot_txt_setenv_origin/$boot_txt_setenv_replace/g" "$boot_txt_path" &&
     echo "Content of $boot_txt_path:$(cat "$boot_txt_path")" &&
     echo "cd /boot/ && ./mkscr || exit 1" | chroot "$root_mount_path" /bin/bash || error
 fi