parted-usb.sh: try multiple defaults for $GPG_INPUT_DIR

2 files changed, 10 insertions, 2 deletions

diff --git a/fsmgr b/fsmgr
-Subproject 0715d83acfea3dd97c9eb1c2bd4be5977786549
+Subproject a889ea181ff4a30440ada6c87ac63725942b8f3
diff --git a/src/parted-usb.sh b/src/parted-usb.sh
index 919aae2..4302f1b 100755
--- a/src/parted-usb.sh
+++ b/src/parted-usb.sh
@@ -219,9 +219,17 @@ samizdat_linux_dir=/boot
 
 ROOTFS=rootfs/samizdat-gold.seed.btrfs
 #PATCHFS=rootfs/samizdat.patch.btrfs
-GPG_INPUT_DIR=/root/.gnupg
 
-: ${GPG_INPUT_DIR:=/cdrom/gnupghome}
+if [ ! "$GPG_INPUT_DIR" ]
+then
+  for d in $GPG_INPUT_DIR /root/.gnupg /cdrom/gnupghome
+  do
+     [ -d "$d" ] || continue
+     GPG_INPUT_DIR=$d
+     break
+  done
+fi
+
 : ${GRUB_CONFIG:=conf/grub.cfg}
 start_keys=64 # megs
 end_keys=256 # megs