rename usb.sh -> usb

3 files changed, 4 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 453b315..e63d940 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ src_bin_programs = xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh
 btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh               \
 dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh \
 selfstrap samizdat-daily-snapshot-root samizdat-diff-root kiki-export-stdout    \
-kiki-import-stdin store-child-permanently git-ll-remote                         \
+kiki-import-stdin store-child-permanently git-ll-remote usb                     \
 hostname.cryptonomic.net ${dyndns_progs}
 
 bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils}
diff --git a/src/parted-usb.sh b/src/parted-usb.sh
index 05b776c..f8855d3 100755
--- a/src/parted-usb.sh
+++ b/src/parted-usb.sh
@@ -353,12 +353,14 @@ fi
 
 default_target=boot-disk.img
 
+USB=$(which usb || echo ./src/usb)
+
 if [ "$1" ]
 then
     if [ "$1" = USB ]
     then
         [ "$DO_BUILD" ] && arg= || arg=-n
-        target=$(./src/usb.sh $arg) || exit 1
+        target=$($USB $arg) || exit 1
     elif [ -f "$1" ]
     then
         case "$1" in
diff --git a/src/usb.sh b/src/usb
index a8fd5fb..a8fd5fb 100755
--- a/src/usb.sh
+++ b/src/usb