Create generic script for partitioning disks

scripts/Arch/OS/default-partition.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-{
-    echo "g";
-
-    echo "n";
-    echo "";
-    echo "";
-    echo "+1G";
-    echo "y";
-    echo "t";
-    echo "1";
-
-    echo "n";
-    echo "";
-    echo "";
-    echo "+${SWAP_SIZE}G";
-    echo "y";
-    echo "t";
-    echo "";
-    echo "19";
-
-    echo "n";
-    echo "";
-    echo "";
-    echo "";
-    echo "y";
-    echo "t";
-    echo "";
-    echo "23";
-
-    echo "w";
-} | fdisk "$ARCH_DISK";

scripts/Arch/OS/partition.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-pushd "${BASH_SOURCE%/*}" > /dev/null;
-
-source "../../Common/Scripts/is-truthy.sh";
-source "../../Common/Scripts/choose-disk.sh";
-ARCH_DISK="${ARCH_DISK}";
-SKIP_FORMAT_EFI="${SKIP_FORMAT_EFI}";
-PARTITION_SCRIPT="${PARTITION_SCRIPT:-"./default-partition.sh"}";
-memory="$(cat /proc/meminfo | awk -F " " '/^MemTotal/ { print $2 }')";
-swapSize="$(echo "$memory" | awk '{ print int((($1 / 1024 / 1024) * 0.75) + 0.5)}')";
-
-export SWAP_SIZE="$swapSize";
-
-if [ ! -z "$ARCH_DISK" ] && [ ! -e "$ARCH_DISK" ]
-then
-    ARCH_DISK="/dev/${ARCH_DISK}"
-fi;
-
-if [ -z "$ARCH_DISK" ] || [ ! -e "$ARCH_DISK" ]
-then
-    chooseDisk ARCH_DISK "Which disk do you wish to format for installing Arch?";
-fi;
-
-. "$PARTITION_SCRIPT";
-
-while true
-do
-    disks=($(bash -c "echo $ARCH_DISK*"));
-    [ "${#disks[@]}" -ge 4 ] && break;
-done;
-
-bootDisk="${BOOT_DISK:-"${disks[1]}"}";
-swapDisk="${SWAP_DISK:-"${disks[2]}"}";
-linuxDisk="${LINUX_DISK:-"${disks[3]}"}";
-
-if ! isTruthy "$SKIP_FORMAT_EFI"
-then
-    mkfs.fat -F 32 "$bootDisk";
-fi
-
-mkswap "$swapDisk";
-mkfs.ext4 -F "$linuxDisk";
-
-mount "$linuxDisk" /mnt;
-mount --mkdir "$bootDisk" /mnt/boot;
-swapon "$swapDisk";
-
-if command -v extraMounts
-then
-    extraMounts;
-fi;
-
-popd > /dev/null;

scripts/Arch/OS/setup.sh

@@ -22,7 +22,8 @@ tempDir="$tempRoot/$relativeDir";
 
 loadkeys "$ARCH_KEYMAP";
 timedatectl set-timezone "$ARCH_TIMEZONE";
-. "./partition.sh";
+OS_DISK="${ARCH_DISK}" \
+    . "../../Common/OS/partition.sh";
 
 pacman-key --init;
 pacman-key --populate;