Clean up Arch/Fedora support and modify expand.sh to include it

expand.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-sudo apt install -y cloud-guest-utils fdisk e2fsck-static || true
+source utils/system.sh
+
+installDependencies cloud-guest-utils e2fsprogs
 
 lsblk | grep -v loop
 

setup.sh

@@ -41,9 +41,6 @@ source utils/distros/${DISTRO}.sh
 # Exit on errors
 set -e
 
-# Determine host system
-whichOperatingSystem
-
 # Many much importance
 installDependencies toilet
 

utils/system.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# Source other files to simplify importing this script on more minimal bash scripts
+# (e.g. expand.sh or genimg.sh)
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+source ${DIR}/functions.sh
+
 # Determine host system 
 function whichOperatingSystem {
 
@@ -38,12 +43,19 @@ function installDependencies () {
 
     # NOTE: "$*" is used to call all function arguments
 
+    # Identify the distro if it is undefined
+    if [[ -z $DIST ]]; then
+        whichOperatingSystem
+    fi
+
+    echo "Installing $*"
+
     # Download dependencies based on distribution
     case $DIST in
 
     Debian)
         # Install dependencies on a Debian host system
-        sudo apt install -y $*
+        sudo apt install -y "$@"
         ;;
 
     Arch)
@@ -60,6 +72,11 @@ function installDependencies () {
                         var=vboot-utils;
                         ;;
 
+                    # growpart
+                    cloud-guest-utils)
+                        var=growpartfs;
+                        ;;
+
                     # cgpt
                     cgpt)
                         unset var; # Included in vboot-utils
@@ -87,6 +104,11 @@ function installDependencies () {
                     var=vboot-utils;
                     ;;
 
+                # growpart
+                cloud-guest-utils)
+                    var=cloud-utils-growpart;
+                    ;;
+
                 # cgpt
                 cgpt)
                     unset var; # Included in vboot-utils