From a5debac55d7b148b99f0660e8865683c088ab6bf Mon Sep 17 00:00:00 2001 From: scjody <scjody> Date: Tue, 24 Apr 2007 01:12:07 +0000 Subject: [PATCH] Branch HEAD Run these with "bash" not "sh" since they use bash-only features disabled when newer versions of bash are invoked as "sh". --- build/branch.sh | 2 +- build/land1.sh | 2 +- build/land2.sh | 2 +- build/merge1.sh | 2 +- build/merge2.sh | 2 +- build/replace1.sh | 2 +- build/replace2.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/branch.sh b/build/branch.sh index 591213fc4f..88c0e420c5 100755 --- a/build/branch.sh +++ b/build/branch.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e CVS=${CVS:-cvs} progname=${0##*/} diff --git a/build/land1.sh b/build/land1.sh index a4f56da99b..ef875e64b2 100755 --- a/build/land1.sh +++ b/build/land1.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e progname=${0##*/} diff --git a/build/land2.sh b/build/land2.sh index 01a5309562..ea616a91cd 100755 --- a/build/land2.sh +++ b/build/land2.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e CVS=cvs diff --git a/build/merge1.sh b/build/merge1.sh index 1c9f68f1f2..cbd32279c7 100755 --- a/build/merge1.sh +++ b/build/merge1.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e CONFLICTS=cvs-merge-conflicts CVS="cvs -z3" diff --git a/build/merge2.sh b/build/merge2.sh index 92cb375266..0ef27cc45a 100755 --- a/build/merge2.sh +++ b/build/merge2.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e if [ ! -f .mergeinfo ] ; then echo ".mergeinfo doesn't exist - exit" diff --git a/build/replace1.sh b/build/replace1.sh index c7ab760cca..cb0c6889da 100755 --- a/build/replace1.sh +++ b/build/replace1.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e progname=${0##*/} diff --git a/build/replace2.sh b/build/replace2.sh index 17d10ea4ef..e0f7b2b05d 100755 --- a/build/replace2.sh +++ b/build/replace2.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e CVS=cvs -- GitLab