parted-usb small fixups

1 files changed, 26 insertions, 28 deletions

diff --git a/src/parted-usb.sh b/src/parted-usb.sh
index 41c2814..6841166 100755
--- a/src/parted-usb.sh
+++ b/src/parted-usb.sh
@@ -13,31 +13,6 @@ MiB()
     KiB $(KiB "$1")
 }
 
-. samizdat-paths.sh || die 'samizdat-paths.sh not found'
-
-samizdat_linux_dir=/boot
-
-: ${GPG_INPUT_DIR:=/cdrom/gnupghome}
-: ${GRUB_CONFIG:=grub.cfg}
-
-if [[ $UID != 0 ]]
-then
-    exit 1
-fi
-
-for d in "$samizdat_linux_dir" "$GPG_INPUT_DIR"
-do
-    if ! test -d "$d"
-    then
-        exit 1
-    fi
-done
-
-start_keys=64 # megs
-end_keys=256 # megs
-
-target=fallacy.img.tmp
-
 initialize_target()
 {
     rm -f "$target"
@@ -56,7 +31,6 @@ partition_target()
 
 make_target_bootable()
 {
-    version=${1:+-$1}
     losetup -f "$target"
     dev=$(losetup -j "$target" -O NAME --noheadings)
 
@@ -121,18 +95,42 @@ add_all()
     add_grub_cfg
 }
 
+sanity_checks()
+{
+    [[ $UID = 0 ]] || die "You are not root."
+    for d in "$samizdat_linux_dir" "$GPG_INPUT_DIR"
+    do
+        [ -d "$d" ] || die "Not a directory: $d"
+    done
+}
+
+
+
+
+. samizdat-paths.sh || die 'samizdat-paths.sh not found'
+samizdat_linux_dir=/boot
+: ${GPG_INPUT_DIR:=/cdrom/gnupghome}
+: ${GRUB_CONFIG:=grub.cfg}
+start_keys=64 # megs
+end_keys=256 # megs
+target=fallacy.img.tmp
+
+sanity_checks
 set -e
 
 if [ ! -e "$target" ]
 then
     initialize_target
     partition_target
-    make_target_bootable ${1:4.9.0-0.bpo.2-amd64}
+    make_target_bootable
     release_target
 fi
 
+if [ "$1" ]
+then
+    version=-$1
+fi
 cp --reflink=always "$target" "$target".keyed
-
 with_target "$target".keyed add_all
 
 qemu-system-x86_64 -enable-kvm -smp 2 -m 512 -k en-us -vga qxl -drive file="$target".keyed,format=raw