[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor-ramdisk/master] Switch from sh to bash

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-ramdisk/master] Switch from sh to bash
From: blueness@xxxxxxxxxxxxxx
Date: Sun, 16 Jun 2013 13:59:17 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sun, 16 Jun 2013 09:59:29 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Anthony G. Basile <blueness@xxxxxxxxxx>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx

commit 1c0022ce326261a5bcddaa8f3079e436faf84fef
Author: Anthony G. Basile <blueness@xxxxxxxxxx>
Date:   Sun Jun 16 09:59:23 2013 -0400

    Switch from sh to bash
---
 build-arm.sh  |   34 +++++++++++++++++-----------------
 build-mips.sh |   40 ++++++++++++++++++++--------------------
 build.sh      |   50 +++++++++++++++++++++++++-------------------------
 3 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/build-arm.sh b/build-arm.sh
index 43aa9a7..20c37f6 100755
--- a/build-arm.sh
+++ b/build-arm.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 RELEASE=ar7161.testing
 
@@ -11,8 +11,8 @@ OPENSSH=openssh-6.1p1
 
 set_start()
 {
-	[ "x$CLEAN" = "xyes" ] && rm -rf release
-	[ "x$DEBUG" = "x" ] && unset DEBUG
+	[[ "x$CLEAN" = "xyes" ]] && rm -rf release
+	[[ "x$DEBUG" = "x" ]] && unset DEBUG
 }
 
 ################################################################################
@@ -32,12 +32,12 @@ get_configs()
 	mkdir -p configs
 	cd configs
 
-	if [ "x$DEBUG" = "xyes" ] ; then
-		[ ! -f $BUSYBOX.debug.config ] && echo "Missing busybox config" && exit
+	if [[ "x$DEBUG" = "xyes" ]] ; then
+		[[ ! -f $BUSYBOX.debug.config ]] && echo "Missing busybox config" && exit
 	else
-		[ ! -f $BUSYBOX.config ] && echo "Missing busybox config" && exit
+		[[ ! -f $BUSYBOX.config ]] && echo "Missing busybox config" && exit
 	fi
-	[ ! -f setup ] && echo "Missing setup script" && exit
+	[[ ! -f setup ]] && echo "Missing setup script" && exit
 }
 
 ################################################################################
@@ -48,10 +48,10 @@ get_sources()
 	mkdir -p sources
 	cd sources
 
-	[ ! -f $BUSYBOX.tar.bz2 ] && wget http://www.busybox.net/downloads/$BUSYBOX.tar.bz2
-	[ ! -f $TOR.tar.gz ] && wget http://www.torproject.org/dist/$TOR.tar.gz
-	[ ! -f $NTPD.tar.gz ] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$NTPD.tar.gz
-	[ ! -f $OPENSSH.tar.gz ] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH.tar.gz
+	[[ ! -f $BUSYBOX.tar.bz2 ]] && wget http://www.busybox.net/downloads/$BUSYBOX.tar.bz2
+	[[ ! -f $TOR.tar.gz ]] && wget http://www.torproject.org/dist/$TOR.tar.gz
+	[[ ! -f $NTPD.tar.gz ]] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$NTPD.tar.gz
+	[[ ! -f $OPENSSH.tar.gz ]] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH.tar.gz
 }
 
 ################################################################################
@@ -59,11 +59,11 @@ get_sources()
 build_busybox()
 {
 	cd $WORKING
-	[ -f $BUSYBOX/busybox ] && return 0
+	[[ -f $BUSYBOX/busybox ]] && return 0
 	tar jxvf $WORKING/../sources/$BUSYBOX.tar.bz2
 	cd $BUSYBOX
 	for i in $WORKING/../configs/busybox-*.patch; do patch -p 1 < $i ; done
-	if [ "x$DEBUG" = "xyes" ] ; then
+	if [[ "x$DEBUG" = "xyes" ]] ; then
 		cp $WORKING/../configs/$BUSYBOX.debug.config .config
 	else
 		cp $WORKING/../configs/$BUSYBOX.config .config
@@ -77,7 +77,7 @@ build_busybox()
 build_tor()
 {
 	cd $WORKING
-	[ -f $TOR/src/or/tor ] && return 0
+	[[ -f $TOR/src/or/tor ]] && return 0
 	tar zxvf $WORKING/../sources/$TOR.tar.gz
 	cd $TOR
 	for i in $WORKING/../configs/tor-*.patch; do patch -p 1 < $i ; done
@@ -91,7 +91,7 @@ build_tor()
 build_ntpd()
 {
 	cd $WORKING
-	[ -f $NTPD/ntpd ] && return 0
+	[[ -f $NTPD/ntpd ]] && return 0
 	tar zxvf $WORKING/../sources/$NTPD.tar.gz
 	cd $NTPD
 	sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h
@@ -105,7 +105,7 @@ build_ntpd()
 build_scp()
 {
 	cd $WORKING
-	[ -f $OPENSSH/ssh -a -f $OPENSSH/scp ] && return 0
+	[[ -f $OPENSSH/ssh && -f $OPENSSH/scp ]] && return 0
 	tar zxvf $WORKING/../sources/$OPENSSH.tar.gz
 	cd $OPENSSH
 	./configure --prefix=
@@ -238,7 +238,7 @@ EOF
 cat << EOF > group
 root:x:0:
 tor:x:500:
-ntp:x:500:
+ntp:x:501:
 EOF
 
 cat << EOF > gshadow
diff --git a/build-mips.sh b/build-mips.sh
index b28344b..274dbe4 100755
--- a/build-mips.sh
+++ b/build-mips.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 RELEASE=ar7161.testing
 
@@ -11,8 +11,8 @@ OPENSSH=openssh-6.1p1
 
 set_start()
 {
-	[ "x$CLEAN" = "xyes" ] && rm -rf release
-	[ "x$DEBUG" = "x" ] && unset DEBUG
+	[[ "x$CLEAN" = "xyes" ]] && rm -rf release
+	[[ "x$DEBUG" = "x" ]] && unset DEBUG
 }
 
 ################################################################################
@@ -32,12 +32,12 @@ get_configs()
 	mkdir -p configs
 	cd configs
 
-	if [ "x$DEBUG" = "xyes" ] ; then
-		[ ! -f $BUSYBOX.debug.config ] && echo "Missing busybox config" && exit
+	if [[ "x$DEBUG" = "xyes" ]] ; then
+		[[ ! -f $BUSYBOX.debug.config ]] && echo "Missing busybox config" && exit
 	else
-		[ ! -f $BUSYBOX.config ] && echo "Missing busybox config" && exit
+		[[ ! -f $BUSYBOX.config ]] && echo "Missing busybox config" && exit
 	fi
-	[ ! -f setup ] && echo "Missing setup script" && exit
+	[[ ! -f setup ]] && echo "Missing setup script" && exit
 }
 
 ################################################################################
@@ -48,10 +48,10 @@ get_sources()
 	mkdir -p sources
 	cd sources
 
-	[ ! -f $BUSYBOX.tar.bz2 ] && wget http://www.busybox.net/downloads/$BUSYBOX.tar.bz2
-	[ ! -f $TOR.tar.gz ] && wget http://www.torproject.org/dist/$TOR.tar.gz
-	[ ! -f $NTPD.tar.gz ] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$NTPD.tar.gz
-	[ ! -f $OPENSSH.tar.gz ] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH.tar.gz
+	[[ ! -f $BUSYBOX.tar.bz2 ]] && wget http://www.busybox.net/downloads/$BUSYBOX.tar.bz2
+	[[ ! -f $TOR.tar.gz ]] && wget http://www.torproject.org/dist/$TOR.tar.gz
+	[[ ! -f $NTPD.tar.gz ]] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$NTPD.tar.gz
+	[[ ! -f $OPENSSH.tar.gz ]] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH.tar.gz
 }
 
 ################################################################################
@@ -59,11 +59,11 @@ get_sources()
 build_busybox()
 {
 	cd $WORKING
-	[ -f $BUSYBOX/busybox ] && return 0
+	[[ -f $BUSYBOX/busybox ]] && return 0
 	tar jxvf $WORKING/../sources/$BUSYBOX.tar.bz2
 	cd $BUSYBOX
 	for i in $WORKING/../configs/busybox-*.patch; do patch -p 1 < $i ; done
-	if [ "x$DEBUG" = "xyes" ] ; then
+	if [[ "x$DEBUG" = "xyes" ]] ; then
 		cp $WORKING/../configs/$BUSYBOX.debug.config .config
 	else
 		cp $WORKING/../configs/$BUSYBOX.config .config
@@ -77,7 +77,7 @@ build_busybox()
 build_tor()
 {
 	cd $WORKING
-	[ -f $TOR/src/or/tor ] && return 0
+	[[ -f $TOR/src/or/tor ]] && return 0
 	tar zxvf $WORKING/../sources/$TOR.tar.gz
 	cd $TOR
 	for i in $WORKING/../configs/tor-*.patch; do patch -p 1 < $i ; done
@@ -91,7 +91,7 @@ build_tor()
 build_ntpd()
 {
 	cd $WORKING
-	[ -f $NTPD/ntpd ] && return 0
+	[[ -f $NTPD/ntpd ]] && return 0
 	tar zxvf $WORKING/../sources/$NTPD.tar.gz
 	cd $NTPD
 	sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h
@@ -105,7 +105,7 @@ build_ntpd()
 build_scp()
 {
 	cd $WORKING
-	[ -f $OPENSSH/ssh -a -f $OPENSSH/scp ] && return 0
+	[[ -f $OPENSSH/ssh && -f $OPENSSH/scp ]] && return 0
 	tar zxvf $WORKING/../sources/$OPENSSH.tar.gz
 	cd $OPENSSH
 	./configure --prefix=
@@ -150,7 +150,7 @@ populate_bin()
 
 get_needed()
 {
-	local A=$(readelf -a $1 | grep NEEDED | sed -e 's/^.*library://' -e 's/\[//' -e 's/\]//')
+	local A=$(readelf && $1 | grep NEEDED | sed -e 's/^.*library://' -e 's/\[[//' -e 's/\]]//')
 	echo $A
 }
 
@@ -160,8 +160,8 @@ populate_lib()
 	for i in busybox ntpd ssh tor; do
 		A=$(get_needed ../bin/$i)
 		for j in $A ; do
-			[ -e /lib/$j ] && cp -f /lib/$j .
-			[ -e /usr/lib/$j ] && cp -f /usr/lib/$j .
+			[[ -e /lib/$j ]] && cp -f /lib/$j .
+			[[ -e /usr/lib/$j ]] && cp -f /usr/lib/$j .
 		done
 	done
 
@@ -247,7 +247,7 @@ EOF
 cat << EOF > group
 root:x:0:
 tor:x:500:
-ntp:x:500:
+ntp:x:501:
 EOF
 
 cat << EOF > gshadow
diff --git a/build.sh b/build.sh
index c1128f5..7f2a2f3 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 BUSYBOX=busybox-1.20.2
 TOR=tor-0.2.3.25
@@ -13,23 +13,23 @@ PATCHES=hardened-patches-${KVERSION}-1.extras
 
 set_start()
 {
-	[ "x$CLEAN" = "xyes" ] && rm -rf release
-	[ "x$DEBUG" = "x" ] && unset DEBUG
+	[[ "x$CLEAN" = "xyes" ]] && rm -rf release
+	[[ "x$DEBUG" = "x" ]] && unset DEBUG
 }
 
 ################################################################################
 
 set_target()
 {
-	[ "x$TARGET" = "x" ] && TARGET="x86"
-	[ "x$TARGET" != "xx86" -a "x$TARGET" != "xx86_64" ] && echo "Unknown ARCH" && exit
+	[[ "x$TARGET" = "x" ]] && TARGET="x86"
+	[[ "x$TARGET" != "xx86" && "x$TARGET" != "xx86_64" ]] && echo "Unknown ARCH" && exit
 }
 
 ################################################################################
 
 set_release()
 {
-	[ "x$RELEASE" = "x" ] && RELEASE="testing"
+	[[ "x$RELEASE" = "x" ]] && RELEASE="testing"
 }
 
 ################################################################################
@@ -49,13 +49,13 @@ get_configs()
 	mkdir -p configs
 	cd configs
 
-	if [ "x$DEBUG" = "xyes" ] ; then
-		[ ! -f $BUSYBOX.debug.config ] && echo "Missing busybox config" && exit
+	if [[ "x$DEBUG" = "xyes" ]] ; then
+		[[ ! -f $BUSYBOX.debug.config ]] && echo "Missing busybox config" && exit
 	else
-		[ ! -f $BUSYBOX.config ] && echo "Missing busybox config" && exit
+		[[ ! -f $BUSYBOX.config ]] && echo "Missing busybox config" && exit
 	fi
-	[ ! -f setup ] && echo "Missing setup script" && exit
-	[ ! -f kernel-$KVERSION.$TARGET.config ] && echo "Missing kernel config" && exit
+	[[ ! -f setup ]] && echo "Missing setup script" && exit
+	[[ ! -f kernel-$KVERSION.$TARGET.config ]] && echo "Missing kernel config" && exit
 }
 
 ################################################################################
@@ -66,12 +66,12 @@ get_sources()
 	mkdir -p sources
 	cd sources
 
-	[ ! -f $BUSYBOX.tar.bz2 ] && wget http://www.busybox.net/downloads/$BUSYBOX.tar.bz2
-	[ ! -f $TOR.tar.gz ] && wget http://www.torproject.org/dist/$TOR.tar.gz
-	[ ! -f $NTPD.tar.gz ] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$NTPD.tar.gz
-	[ ! -f $LINUX.tar.bz2 ] && wget http://www.kernel.org/pub/linux/kernel/v3.x/$LINUX.tar.bz2
-	[ ! -f $PATCHES.tar.bz2 ] && wget http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/$PATCHES.tar.bz2 
-	[ ! -f $OPENSSH.tar.gz ] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH.tar.gz
+	[[ ! -f $BUSYBOX.tar.bz2 ]] && wget http://www.busybox.net/downloads/$BUSYBOX.tar.bz2
+	[[ ! -f $TOR.tar.gz ]] && wget http://www.torproject.org/dist/$TOR.tar.gz
+	[[ ! -f $NTPD.tar.gz ]] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$NTPD.tar.gz
+	[[ ! -f $LINUX.tar.bz2 ]] && wget http://www.kernel.org/pub/linux/kernel/v3.x/$LINUX.tar.bz2
+	[[ ! -f $PATCHES.tar.bz2 ]] && wget http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/$PATCHES.tar.bz2 
+	[[ ! -f $OPENSSH.tar.gz ]] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH.tar.gz
 }
 
 ################################################################################
@@ -79,11 +79,11 @@ get_sources()
 build_busybox()
 {
 	cd $WORKING
-	[ -f $BUSYBOX/busybox ] && return 0
+	[[ -f $BUSYBOX/busybox ]] && return 0
 	tar jxvf $WORKING/../sources/$BUSYBOX.tar.bz2
 	cd $BUSYBOX
 	for i in $WORKING/../configs/busybox-*.patch; do patch -p 1 < $i ; done
-	if [ "x$DEBUG" = "xyes" ] ; then
+	if [[ "x$DEBUG" = "xyes" ]] ; then
 		cp $WORKING/../configs/$BUSYBOX.debug.config .config
 	else
 		cp $WORKING/../configs/$BUSYBOX.config .config
@@ -96,7 +96,7 @@ build_busybox()
 build_tor()
 {
 	cd $WORKING
-	[ -f $TOR/src/or/tor ] && return 0
+	[[ -f $TOR/src/or/tor ]] && return 0
 	tar zxvf $WORKING/../sources/$TOR.tar.gz
 	cd $TOR
 	for i in $WORKING/../configs/tor-*.patch; do patch -p 1 < $i ; done
@@ -110,7 +110,7 @@ build_tor()
 build_ntpd()
 {
 	cd $WORKING
-	[ -f $NTPD/ntpd ] && return 0
+	[[ -f $NTPD/ntpd ]] && return 0
 	tar zxvf $WORKING/../sources/$NTPD.tar.gz
 	cd $NTPD
 	sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h
@@ -124,7 +124,7 @@ build_ntpd()
 build_scp()
 {
 	cd $WORKING
-	[ -f $OPENSSH/ssh -a -f $OPENSSH/scp ] && return 0
+	[[ -f $OPENSSH/ssh && -f $OPENSSH/scp ]] && return 0
 	tar zxvf $WORKING/../sources/$OPENSSH.tar.gz
 	cd $OPENSSH
 	./configure --prefix=
@@ -191,7 +191,7 @@ cat << EOF > fstab
 none          /proc       proc    defaults   0 0
 EOF
 
-if [ "x$DEBUG" = "xyes" ] ; then
+if [[ "x$DEBUG" = "xyes" ]] ; then
 cat << EOF > inittab
 ::sysinit:/etc/rcS
 tty1::respawn:/bin/setup
@@ -338,7 +338,7 @@ finish_initramfs()
 compile_kernel()
 {
 	cd $WORKING
-	[ -f $LINUX/arch/$TARGET/boot/bzImage ] && return 0
+	[[ -f $LINUX/arch/$TARGET/boot/bzImage ]] && return 0
 	tar jxvf $WORKING/../sources/$LINUX.tar.bz2
 	tar jxvf $WORKING/../sources/$PATCHES.tar.bz2 
 	cd $LINUX
@@ -371,7 +371,7 @@ EOF
 
 	mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o tor.iso iso.tor
 
-	if [ "x$DEBUG" = "xyes" ] ; then
+	if [[ "x$DEBUG" = "xyes" ]] ; then
 		mv tor.iso tor.uclibc.$TARGET.debug.$RELEASE.iso
 		md5sum tor.uclibc.$TARGET.debug.$RELEASE.iso > tor.uclibc.$TARGET.debug.$RELEASE.iso.md5
 	else

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [stem/master] Fix parsing of IPv6 address:port pairs in stream events (fixes #9181)
Next by Author: [tor-commits] r26219: {website} Adding Johannes' GSoC application as an example Johannes mad (website/trunk/about/en)
Previous by thread: [tor-commits] r26218: {website} HS websites are also actual websites. changed to normal (website/trunk/docs/en)
Next by thread: [tor-commits] [metrics-web/master] Put last consensus valid-after time on relay-search page.
Index(es):
- Author
- Thread