From 5d7b8e6ef24269262345c8610354db270b769f97 Mon Sep 17 00:00:00 2001
From: Ger van Diepen <diepen@astron.nl>
Date: Tue, 16 Sep 2008 13:36:46 +0000
Subject: [PATCH] bug 1243: Added support for sbin
---
LCS/Tools/src/Makefile.am | 6 +++---
LCS/Tools/src/lofarinit.csh | 16 ++++++++++------
LCS/Tools/src/lofarinit.sh | 24 +++++++++++++++---------
3 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/LCS/Tools/src/Makefile.am b/LCS/Tools/src/Makefile.am
index a0a663bc5fd..68d85267672 100644
--- a/LCS/Tools/src/Makefile.am
+++ b/LCS/Tools/src/Makefile.am
@@ -1,15 +1,15 @@
-bin_PROGRAMS = LimitExec pkgdep
+sbin_PROGRAMS = LimitExec pkgdep
LimitExec_SOURCES = LimitExec.cc
pkgdep_SOURCES = pkgdep.cc
-scriptdir = $(bindir)
+scriptdir = $(sbindir)
dist_script_SCRIPTS = lofarcvsmv lofarcvsx makedep.sh finddep makedoc checkrun
glishdir = $(libexecdir)/glish
dist_glish_SCRIPTS =
-pythondir = $(bindir)
+pythondir = $(sbindir)
dist_python_SCRIPTS = makePackage.py \
makeClass.py \
makeTest.py
diff --git a/LCS/Tools/src/lofarinit.csh b/LCS/Tools/src/lofarinit.csh
index 4eb180e00b6..491ed148489 100644
--- a/LCS/Tools/src/lofarinit.csh
+++ b/LCS/Tools/src/lofarinit.csh
@@ -45,8 +45,10 @@ else
if ($?LOFARROOT) then
set a_path = `echo $LOFARROOT | sed -e 's/\./\\\./g'`
if ($?PATH) then
- set a_bin = "$a_path/bin"
- setenv PATH `echo $PATH | sed -e "s%:${a_bin}:%:%g" -e "s%^${a_bin}:%%" -e "s%:${a_bin}"'$%%' -e "s%^${a_bin}"'$%%'`
+ foreach bintp (bin sbin)
+ set a_bin = "$a_path/$bintp"
+ setenv PATH `echo $PATH | sed -e "s%:${a_bin}:%:%g" -e "s%^${a_bin}:%%" -e "s%:${a_bin}"'$%%' -e "s%^${a_bin}"'$%%'`
+ end
endif
if ($?LD_LIBRARY_PATH) then
set a_lib = "$a_path/lib"
@@ -65,8 +67,10 @@ else
# it).
set a_path = `echo $LOFARROOT | sed -e 's/\./\\\./g'`
if ($?PATH) then
- set a_bin = "$a_path/bin"
- setenv PATH `echo $PATH | sed -e "s%:${a_bin}:%:%g" -e "s%^${a_bin}:%%" -e "s%:${a_bin}"'$%%' -e "s%^${a_bin}"'$%%'`
+ foreach bintp (bin sbin)
+ set a_bin = "$a_path/$bintp"
+ setenv PATH `echo $PATH | sed -e "s%:${a_bin}:%:%g" -e "s%^${a_bin}:%%" -e "s%:${a_bin}"'$%%' -e "s%^${a_bin}"'$%%'`
+ end
endif
if ($?LD_LIBRARY_PATH) then
set a_lib = "$a_path/lib"
@@ -79,9 +83,9 @@ else
# Add the path to the standard paths.
if (! $?PATH) then
- setenv PATH $LOFARROOT/bin
+ setenv PATH $LOFARROOT/bin:$LOFARROOT/sbin
else
- setenv PATH $LOFARROOT/bin:$PATH
+ setenv PATH $LOFARROOT/bin:$LOFARROOT/sbin:$PATH
endif
if (! $?LD_LIBRARY_PATH) then
setenv LD_LIBRARY_PATH $LOFARROOT/lib
diff --git a/LCS/Tools/src/lofarinit.sh b/LCS/Tools/src/lofarinit.sh
index b83fa30d29c..d820801f3d6 100644
--- a/LCS/Tools/src/lofarinit.sh
+++ b/LCS/Tools/src/lofarinit.sh
@@ -40,9 +40,12 @@ fi
# Take care that a possible . is preceeded by a backslash (for the later sed).
if [ "$LOFARROOT" != "" ]; then
lfr_path=`echo $LOFARROOT | sed -e 's/\./\\\./g'`
- lfr_bin="$lfr_path/bin"
- PATH=`echo $PATH | sed -e "s%:$lfr_bin:%:%g" -e "s%^$lfr_bin:%%" -e "s%:$lfr_bin$%%" -e "s%^$lfr_bin$%%"`
- export PATH
+ for bintp in bin sbin
+ do
+ lfr_bin="$lfr_path/$bintp"
+ PATH=`echo $PATH | sed -e "s%:$lfr_bin:%:%g" -e "s%^$lfr_bin:%%" -e "s%:$lfr_bin$%%" -e "s%^$lfr_bin$%%"`
+ export PATH
+ done
lfr_lib="$lfr_path/lib"
LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed -e "s%:$lfr_lib:%:%g" -e "s%^$lfr_lib:%%" -e "s%:$lfr_lib$%%" -e "s%^$lfr_lib$%%"`
export LD_LIBRARY_PATH
@@ -62,9 +65,12 @@ else
# Also strip root from the current paths (in case it is contained).
lfr_path=`echo $LOFARROOT | sed -e 's/\./\\\./g'`
- lfr_bin="$lfr_path/bin"
- PATH=`echo $PATH | sed -e "s%:$lfr_bin:%:%g" -e "s%^$lfr_bin:%%" -e "s%:$lfr_bin$%%" -e "s%^$lfr_bin$%%"`
- export PATH
+ for bintp in bin sbin
+ do
+ lfr_bin="$lfr_path/$bintp"
+ PATH=`echo $PATH | sed -e "s%:$lfr_bin:%:%g" -e "s%^$lfr_bin:%%" -e "s%:$lfr_bin$%%" -e "s%^$lfr_bin$%%"`
+ export PATH
+ done
lfr_lib="$lfr_path/lib"
LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed -e "s%:$lfr_lib:%:%g" -e "s%^$lfr_lib:%%" -e "s%:$lfr_lib$%%" -e "s%^$lfr_lib$%%"`
export LD_LIBRARY_PATH
@@ -73,15 +79,15 @@ else
export PYTHONPATH
fi
-# Add to the paths if the bin directory exsists.
+# Add to the paths if the bin directory exists.
if [ "$LOFARROOT" = "" -o ! -d $LOFARROOT/bin ]; then
echo "No LOFARROOT defined"
else
# Add the path to the standard paths.
if [ "$PATH" = "" ]; then
- PATH=$LOFARROOT/bin
+ PATH=$LOFARROOT/bin:$LOFARROOT/sbin
else
- PATH=$LOFARROOT/bin:$PATH
+ PATH=$LOFARROOT/bin:$LOFARROOT/sbin:$PATH
fi
export PATH
if [ "$LD_LIBRARY_PATH" = "" ]; then
--
GitLab