From: Sage Weil Date: Thu, 10 Feb 2011 20:48:33 +0000 (-0800) Subject: fix bashisms X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b96a63e3f74669aede144267eeadff4f673faedb;p=ceph-build.git fix bashisms --- diff --git a/build_dsc.sh b/build_dsc.sh index 6ed34d65..6a87b93a 100755 --- a/build_dsc.sh +++ b/build_dsc.sh @@ -49,7 +49,7 @@ do fi # hack - [ "$dist" = "lenny" ] && sed -i 's/, libgoogle-perftools-dev//' ceph-$cephver/debian/control + [ "$dist" == "lenny" ] && sed -i 's/, libgoogle-perftools-dev//' ceph-$cephver/debian/control dpkg-source -b ceph-$cephver diff --git a/gen_debian_version.sh b/gen_debian_version.sh index 82ac05ff..e4934fde 100755 --- a/gen_debian_version.sh +++ b/gen_debian_version.sh @@ -3,12 +3,12 @@ raw=$1 dist=$2 -[ "$dist" = "sid" ] && dver="$raw" -[ "$dist" = "squeeze" ] && dver="$raw~bpo60+1" -[ "$dist" = "lenny" ] && dver="$raw~bpo50+1" -[ "$dist" = "maverick" ] && dver="$raw$dist" -[ "$dist" = "lucid" ] && dver="$raw$dist" -[ "$dist" = "karmic" ] && dver="$raw$dist" +[ "$dist" == "sid" ] && dver="$raw" +[ "$dist" == "squeeze" ] && dver="$raw~bpo60+1" +[ "$dist" == "lenny" ] && dver="$raw~bpo50+1" +[ "$dist" == "maverick" ] && dver="$raw$dist" +[ "$dist" == "lucid" ] && dver="$raw$dist" +[ "$dist" == "karmic" ] && dver="$raw$dist" echo $dver diff --git a/update_pbuilder.sh b/update_pbuilder.sh index 30083dfa..475d0f8e 100755 --- a/update_pbuilder.sh +++ b/update_pbuilder.sh @@ -11,8 +11,9 @@ do os="debian" [ "$dist" == "maverick" ] && os="ubuntu" [ "$dist" == "lucid" ] && os="ubuntu" + [ "$dist" == "natty" ] && os="ubuntu" - if [ $os = "debian" ]; then + if [ $os == "debian" ]; then mirror="http://http.us.debian.org/debian" othermirror="" else @@ -37,4 +38,4 @@ do --mirror "$mirror" \ --othermirror "$othermirror" fi -done \ No newline at end of file +done