From fca9d052304971659366f00ee7105d70d7460b66 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Jacke?= Date: Thu, 2 Dec 2010 09:40:21 +0100 Subject: [PATCH] waf/buildtools: use /bin/sh instead of /bin/bash and put ^ in quotes - some Unix shells actually don't like grep ^foo, use grep "^foo" instead. - bash is not installed on every system, please avoid #!/bin/bash and use #!/bin/sh instead --- buildtools/compare_config_h3.sh | 6 +++--- buildtools/compare_config_h4.sh | 6 +++--- buildtools/compare_generated.sh | 2 +- buildtools/compare_install.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildtools/compare_config_h3.sh b/buildtools/compare_config_h3.sh index 742aa1b5b89..0f640a9540a 100755 --- a/buildtools/compare_config_h3.sh +++ b/buildtools/compare_config_h3.sh @@ -1,10 +1,10 @@ -#!/bin/bash +#!/bin/sh # compare the generated config.h from a waf build with existing samba # build -grep ^.define bin/default/source3/include/config.h | sort > waf-config.h -grep ^.define $HOME/samba_old/source3/include/config.h | sort > old-config.h +grep "^.define" bin/default/source3/include/config.h | sort > waf-config.h +grep "^.define" $HOME/samba_old/source3/include/config.h | sort > old-config.h comm -23 old-config.h waf-config.h diff --git a/buildtools/compare_config_h4.sh b/buildtools/compare_config_h4.sh index 6daa743ed21..b78b36fdd0f 100755 --- a/buildtools/compare_config_h4.sh +++ b/buildtools/compare_config_h4.sh @@ -1,10 +1,10 @@ -#!/bin/bash +#!/bin/sh # compare the generated config.h from a waf build with existing samba # build -grep ^.define bin/default/source4/include/config.h | sort > waf-config.h -grep ^.define $HOME/samba_old/source4/include/config.h | sort > old-config.h +grep "^.define" bin/default/source4/include/config.h | sort > waf-config.h +grep "^.define" $HOME/samba_old/source4/include/config.h | sort > old-config.h comm -23 old-config.h waf-config.h diff --git a/buildtools/compare_generated.sh b/buildtools/compare_generated.sh index ae20fef37de..ebef8a979bd 100755 --- a/buildtools/compare_generated.sh +++ b/buildtools/compare_generated.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # compare the generated files from a waf diff --git a/buildtools/compare_install.sh b/buildtools/compare_install.sh index 5ddbffb6656..b964117550b 100755 --- a/buildtools/compare_install.sh +++ b/buildtools/compare_install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh prefix1="$1" prefix2="$2" -- 2.11.4.GIT