diff --git a/ansible.sh b/ansible.sh index 46eb00d95df8cbdf28048dc0ea100fb63c29202e..17d24d77bf78ee5d56b78e622e3ff6b64ae57e24 100755 --- a/ansible.sh +++ b/ansible.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash ansible-galaxy install -r requirements.yml if [ -z ${1+x} ]; then @@ -9,4 +10,4 @@ fi # Agent running causes issues because SSH seems to prioritise those keys by default SSH_AUTH_SOCK=/dev/null -ansible-playbook -v -i hosts.yml $PLAYBOOK +ansible-playbook -v -i hosts.yml "$PLAYBOOK" diff --git a/flashEMMC.sh b/flashEMMC.sh index b3bd6dad654ca952e4d8b3323c1c759508ac3323..ab10835f3ec77f6a3ded48fa9350dada29d85695 100755 --- a/flashEMMC.sh +++ b/flashEMMC.sh @@ -7,12 +7,12 @@ HASH_LINK=https://de3.mirror.archlinuxarm.org/os/ checkRoot() { - [ `id -u` -eq 0 ] || { echo "Run script (as root) or (with sudo)"; exit 1; } + [[ "$EUID" -eq 0 ]] || { echo "Run script (as root) or (with sudo)"; exit 1; } } diskInfo() { - [[ -e /dev/$DEV ]] || { echo "ERROR: Drive doesn't exist" && exit 1; } - fdisk -l /dev/$DEV + [[ -e /dev/"$DEV" ]] || { echo "ERROR: Drive doesn't exist" && exit 1; } + fdisk -l /dev/"$DEV" echo } @@ -29,18 +29,18 @@ verifyRightDrive() { } umountInitially() { - BLKDEVS=$(find /dev/ -name ${DEV}*) + BLKDEVS=$(find /dev/ -name "${DEV}"*) for LINE in $BLKDEVS; do - sudo umount $LINE + sudo umount "$LINE" done } zeroBeginning() { - dd if=/dev/zero of=/dev/$DEV bs=1M count=8 + dd if=/dev/zero of=/dev/"$DEV" bs=1M count=8 } partitionEMMC() { -fdisk -W always /dev/$DEV << EOF +fdisk -W always /dev/"$DEV" << EOF o n p @@ -53,14 +53,14 @@ EOF } createEXT4fs() { - mkfs.ext4 -O ^metadata_csum,^64bit /dev/${DEV}1 + mkfs.ext4 -O ^metadata_csum,^64bit /dev/"${DEV}"1 } cdToScript() { TMP=$(dirname "$0") - cd $TMP + cd "$TMP" || exit mkdir flashEMMC - cd flashEMMC + cd flashEMMC || exit } unmountFS() { @@ -86,13 +86,13 @@ extractImage() { mountFS() { mkdir root - mount /dev/${DEV}1 root + mount /dev/"${DEV}"1 root [ -e ${IMAGE_NAME}.md5 ] && md5sum -c ${IMAGE_NAME}.md5 || downloadImage && extractImage } flashBootloader() { - cd root/boot - ./sd_fusing.sh /dev/${DEV} + cd root/boot || exit + ./sd_fusing.sh /dev/"${DEV}" cd ../.. } diff --git a/init.sh b/init.sh index 72e7851dd6b7961164231904615fd4f947a063d0..af5ea71a6fbf79fb84a7bcf723779344cab3a9e6 100755 --- a/init.sh +++ b/init.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + generateKey() { touch sshKey touch sshKey.pub @@ -7,7 +9,7 @@ generateKey() { } deployKey() { - sshpass -p alarm ssh-copy-id -i ./sshKey.pub -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PubkeyAuthentication=false alarm@$1 + sshpass -p alarm ssh-copy-id -i ./sshKey.pub -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PubkeyAuthentication=false alarm@"$1" } # If keys are present, we just need to deploy it and destroy the SSH Agent