From f9d4d06e7cbe4965c0737baf8da309b1816ca82d Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sat, 29 Oct 2011 12:06:41 +0300 Subject: [PATCH] Explicit shell specification removed --- projects/convertor/build | 3 --- projects/rlm_stg/build | 3 --- projects/rscriptd/build | 3 --- projects/sgauth/build | 3 --- projects/sgauthstress/build | 3 --- projects/sgconf/build | 3 --- projects/sgconf_xml/build | 3 --- projects/stargazer/build | 3 --- 8 files changed, 24 deletions(-) diff --git a/projects/convertor/build b/projects/convertor/build index 6d28ba2c..c1e2ce78 100755 --- a/projects/convertor/build +++ b/projects/convertor/build @@ -65,7 +65,6 @@ PLUGINS="store/files" if [ "$OS" = "linux" ] then DEFS="$DEFS -DLINUX" - SHELL="/bin/bash" LIB_THREAD=-lpthread else if [ "$OS" = "bsd" ] @@ -81,7 +80,6 @@ else LIB_THREAD=-lc_r fi fi - SHELL="/usr/local/bin/bash" fi if [ -z "$CC" ] @@ -273,7 +271,6 @@ do echo -n "$plugin " >> $CONFFILE done echo "" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE echo "CFLAGS=$CFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build index dbff7910..fa846085 100755 --- a/projects/rlm_stg/build +++ b/projects/rlm_stg/build @@ -71,7 +71,6 @@ if [ "$OS" = "linux" ] then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread - SHELL="/bin/bash" else if [ "$OS" = "bsd" ] then @@ -85,7 +84,6 @@ else LIB_THREAD=-lc_r fi fi - SHELL="/usr/local/bin/bash" CXXFLAGS="$CXXFLAGS -DHAVE_CLOSEFROM" fi @@ -166,6 +164,5 @@ echo "BIN_MODE=$BIN_MODE" >> $CONFFILE echo "DATA_MODE=$DATA_MODE" >> $CONFFILE echo "DIR_MODE=$DIR_MODE" >> $CONFFILE echo "OWNER=$OWNER" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE $MAKE $MAKEOPTS diff --git a/projects/rscriptd/build b/projects/rscriptd/build index 31070a6f..3aa8799b 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -76,7 +76,6 @@ if [ "$OS" = "linux" ] then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread - SHELL="/bin/bash" else if [ "$OS" = "bsd" ] then @@ -91,7 +90,6 @@ else LIB_THREAD=-lc_r fi fi - SHELL="/usr/local/bin/bash" fi if [ -z "$CC" ] @@ -164,7 +162,6 @@ do done echo "" >> $CONFFILE echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE echo "CFLAGS=$CFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE diff --git a/projects/sgauth/build b/projects/sgauth/build index a323cc09..51401204 100755 --- a/projects/sgauth/build +++ b/projects/sgauth/build @@ -74,7 +74,6 @@ if [ "$OS" = "linux" ] then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread - SHELL="/bin/bash" else if [ "$OS" = "bsd" ] then @@ -89,7 +88,6 @@ else LIB_THREAD=-lc_r fi fi - SHELL="/usr/local/bin/bash" fi if [ -z "$CC" ] @@ -162,7 +160,6 @@ do done echo "" >> $CONFFILE echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE echo "CFLAGS=$CFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE diff --git a/projects/sgauthstress/build b/projects/sgauthstress/build index 40abb926..05aba51b 100755 --- a/projects/sgauthstress/build +++ b/projects/sgauthstress/build @@ -78,7 +78,6 @@ if [ "$OS" = "linux" ] then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread - SHELL="/bin/bash" else if [ "$OS" = "bsd" ] then @@ -93,7 +92,6 @@ else LIB_THREAD=-lc_r fi fi - SHELL="/usr/local/bin/bash" fi if [ -z "$CC" ] @@ -286,7 +284,6 @@ do done echo "" >> $CONFFILE echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE echo "CFLAGS=$CFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE diff --git a/projects/sgconf/build b/projects/sgconf/build index 9b827328..27f75399 100755 --- a/projects/sgconf/build +++ b/projects/sgconf/build @@ -74,7 +74,6 @@ if [ "$OS" = "linux" ] then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread - SHELL="/bin/bash" else if [ "$OS" = "bsd" ] then @@ -88,7 +87,6 @@ else LIB_THREAD=-lc_r fi fi - SHELL="/usr/local/bin/bash" fi if [ -z "$CC" ] @@ -181,7 +179,6 @@ do done echo "" >> $CONFFILE echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE echo "CFLAGS=$CFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build index 916b1146..c4ff46b5 100755 --- a/projects/sgconf_xml/build +++ b/projects/sgconf_xml/build @@ -74,7 +74,6 @@ if [ "$OS" = "linux" ] then DEFS="$DEFS -DLINUX" LIB_THREAD=-lpthread - SHELL="/bin/bash" else if [ "$OS" = "bsd" ] then @@ -88,7 +87,6 @@ else LIB_THREAD=-lc_r fi fi - SHELL="/usr/local/bin/bash" fi if [ -z "$CC" ] @@ -181,7 +179,6 @@ do done echo "" >> $CONFFILE echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE echo "CFLAGS=$CFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE diff --git a/projects/stargazer/build b/projects/stargazer/build index 1f61b2e9..23d6677e 100755 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@ -114,7 +114,6 @@ then PLUGINS="$PLUGINS capture/ether_linux capture/ipq_linux" - SHELL="/bin/bash" LIB_THREAD=-lpthread else if [ "$OS" = "bsd" ] @@ -133,7 +132,6 @@ else PLUGINS="$PLUGINS capture/ether_freebsd capture/divert_freebsd" - SHELL="/usr/local/bin/bash" fi if [ -z "$CC" ] @@ -397,7 +395,6 @@ do echo -n "$plugin " >> $CONFFILE done echo "" >> $CONFFILE -echo "SHELL=$SHELL" >> $CONFFILE echo "CXXFLAGS=$CXXFLAGS" >> $CONFFILE echo "CFLAGS=$CFLAGS" >> $CONFFILE echo "LDFLAGS=$LDFLAGS" >> $CONFFILE -- 2.44.2