From 5cc7f0d887f5af67c5405ee92306690cd884baab Mon Sep 17 00:00:00 2001
From: Jesse Hathaway <jesse@mbuki-mvuki.org>
Date: Wed, 31 Oct 2007 09:59:01 -0400
Subject: allow basename of net-root-path to be binary
This is convenient for testing as you can directly export
the build directory, rather than untarring the net image
in another location.
---
helpers/lh_binary_net | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 8c61bce..3eb8b67 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -59,21 +59,28 @@ then
fi
# Creating image file
-if [ "$(basename ${LH_NET_ROOT_PATH})" = "chroot" ]
+ROOT_DIR=$(basename ${LH_NET_ROOT_PATH})
+if [ "${ROOT_DIR}" = "chroot" ]
then
mv chroot chroot.tmp
fi
-mv binary "$(basename ${LH_NET_ROOT_PATH})"
+if [ "${ROOT_DIR}" != "binary" ]
+then
+ mv binary ${ROOT_DIR}
+fi
cd ..
-tar cfz binary-net.tar.gz "$(basename ${OLDPWD})/$(basename ${LH_NET_ROOT_PATH})" "$(basename ${OLDPWD})/tftpboot"
+tar cfz binary-net.tar.gz "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot"
mv binary-net.tar.gz "${OLDPWD}"
cd "${OLDPWD}"
-mv "$(basename ${LH_NET_ROOT_PATH})" binary
+if [ "${ROOT_DIR}" != "binary" ]
+then
+ mv ${ROOT_DIR} binary
+fi
-if [ "$(basename ${LH_NET_ROOT_PATH})" = "chroot" ]
+if [ "${ROOT_DIR}" = "chroot" ]
then
mv chroot.tmp chroot
fi
--
cgit v1.0