[Lunar-commits] <moonbase> Revert "bash_static: move to /usr/bin"

[Zbigniew Luszpinski]

commit f7d695dd29cfacda2fcdba4927ceac1f9504e6f1
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Apr 30 12:34:19 2012 +0200

    Revert "bash_static: move to /usr/bin"
    
    This reverts commit 99dc74112ab26b51a569a0f7f7d29cddb059de42.
---
 shells/bash_static/BUILD        |    8 +++-----
 shells/bash_static/DETAILS      |    2 +-
 shells/bash_static/POST_INSTALL |    4 ++--
 shells/bash_static/POST_REMOVE  |    5 ++---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/shells/bash_static/BUILD b/shells/bash_static/BUILD
index 871b29c..bf159fa 100644
--- a/shells/bash_static/BUILD
+++ b/shells/bash_static/BUILD
@@ -27,7 +27,8 @@
    patch_it $SOURCE24 0  &&
    patch_it $SOURCE25 0  &&
 
-   OPTS+=" --without-bash-malloc         \
+   OPTS+=" --bindir=/bin                 \
+           --without-bash-malloc         \
            --without-installed-readline  \
            --with-curses                 \
            --enable-static-link          \
@@ -38,9 +39,6 @@
    make             &&
    prepare_install  &&
 
-   cp -f bash /usr/bin/bash_static &&
-
-   # legacy links to /bin
-   ln -sf /usr/bin/bash_static /bin/bash_static
+   cp -f bash /bin/bash_static
 
 ) > $C_FIFO 2>&1
diff --git a/shells/bash_static/DETAILS b/shells/bash_static/DETAILS
index 8e1ae07..3cbff7a 100644
--- a/shells/bash_static/DETAILS
+++ b/shells/bash_static/DETAILS
@@ -87,6 +87,6 @@ cat << EOF
 bash_static is the same as bash (Bourne Again SHell) -- just
 a static build of it so one can use it as a rescue shell
 without relying on any shared libraries.
-It will be located at /usr/bin/bash_static. You can call it with
+It will be located at /bin/bash_static. You can call it with
 $ bash_static
 EOF
diff --git a/shells/bash_static/POST_INSTALL b/shells/bash_static/POST_INSTALL
index 440633d..2236e65 100644
--- a/shells/bash_static/POST_INSTALL
+++ b/shells/bash_static/POST_INSTALL
@@ -1,7 +1,7 @@
 cat << END
 
 The static build of bash is installed and located at
-/usr/bin/bash_static.
+/bin/bash_static.
 
 This is NOT an ordinary shell. It is installed for
 rescue purposes.
@@ -9,5 +9,5 @@ rescue purposes.
 END
 
 if [ "$ROOTSHELL" == "y" ] ; then
-  chsh -s /usr/bin/bash_static root
+  chsh -s /bin/bash_static root
 fi
diff --git a/shells/bash_static/POST_REMOVE b/shells/bash_static/POST_REMOVE
index 0b2bde7..714a22a 100644
--- a/shells/bash_static/POST_REMOVE
+++ b/shells/bash_static/POST_REMOVE
@@ -1,5 +1,4 @@
 # set root shell to normal bash again
-if [ `getent passwd root | cut -d: -f7` == "/usr/bin/bash_static" ] ; then
-  chsh -s /usr/bin/bash root
+if [ `getent passwd root | cut -d: -f7` == "/bin/bash_static" ] ; then
+  chsh -s /bin/bash root
 fi
-rm -f /bin/bash_static