From 7cdd56736a9c90b096329442a7aa65125e4a523e Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Fri, 18 Dec 2009 20:37:11 +0059
Subject: =?UTF-8?q?Avoid=20annoying=20warning=20when=20tar=20isn=E2=80=99t?=
 =?UTF-8?q?=20GNU=20tar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/scan-tools.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index ab0de0494..746901c18 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -116,7 +116,7 @@ if ! which tar >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! tar --version|grep GNU >/dev/null 2>&1;then
+if ! (tar --version | grep GNU) >/dev/null 2>&1;then
 	if ! which gtar >/dev/null 2>&1; then
 		echo You must install GNU tar to continue.
 		echo
-- 
cgit v1.2.3


From 77a222d5094d902128d355685501c7b30c8cccca Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 20 Dec 2009 14:52:58 +0059
Subject: Pimp up the progress bar

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 scripts/split-cfg.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh
index 4331709a5..07cdd5838 100644
--- a/scripts/split-cfg.sh
+++ b/scripts/split-cfg.sh
@@ -4,21 +4,21 @@
 # ses the slow-down.
 
 TOPDIR=$1
-
-[[ -n $BASH_VERSION ]] && shopt -s extglob
+(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
+typeset -L$x_cols pbar
 
 grep -v '^BUSYBOX\|^# BUSYBOX' $TOPDIR/.config > $TOPDIR/.config.split
 
 mkdir -p $TOPDIR/.cfg
 cd $TOPDIR/.cfg
 
-oldfiles=$(echo *)
+oldfiles=$(print -r -- *)
 newfiles=:
 
-echo -n 'autosplitting main config...'
+print -nu2 'autosplitting main config...'
 while read line; do
 	oline=$line
-	[[ -n $line ]] && if [[ $line = @(# [A-Z])* ]]; then
+	[[ -n $line ]] && if [[ $line = @(\# [A-Z])* ]]; then
 		line=${line#? }
 		if [[ $line = *@( is not set) ]]; then
 			line=${line% is not set}
@@ -28,12 +28,12 @@ while read line; do
 		fi
 	elif [[ $line = @([A-Z])*@(=)* ]]; then
 		line=${line%%=*}
-	elif [[ $line = @(#)* ]]; then
+	elif [[ $line = \#* ]]; then
 		# valid comment
 		line=
 	else
 		# invalid non-comment
-		echo "Warning: line '$oline' invalid!" >&2
+		print -u2 "\nWarning: line '$oline' invalid!"
 		line=
 	fi
 	# if the line is a valid yes/no/whatever, write it
@@ -44,9 +44,9 @@ while read line; do
 		else
 			fline=
 		fi
-		[[ $oline = $fline ]] || echo "$oline" >$line
+		[[ $oline = $fline ]] || print -r -- "$oline" >$line
 		if [[ $newfiles = *:$line:* ]]; then
-			echo "Error: duplicate Config.in option '$line'!" >&2
+			print -u2 "\nError: duplicate Config.in option '$line'!"
 			exit 1
 		fi
 		newfiles=$newfiles$line:
@@ -54,11 +54,11 @@ while read line; do
 done <$TOPDIR/.config.split
 
 # now handle the case of removals
-echo -n ' removals...'
+print -nu2 ' removals...'
 for oldfile in $oldfiles; do
 	[[ $newfiles = *:$oldfile:* ]] || rm -f $oldfile
 done
-printf '\r%60s\r' ''
+print -nu2 '\r'
 
 # now scan for dependencies of packages; the information
 # should probably be in build_mipsel because it's generated
@@ -69,18 +69,19 @@ printf '\r%60s\r' ''
 cd $TOPDIR/.cfg
 rm -f $TOPDIR/package/*/info.mk
 for option in *; do
-	echo -n "$option ..."
-	x=$(( ${#option} + 4 ))
+	pbar="$option ..."
+	print -nu2 "$pbar\r"
 	ao=:
 	fgrep -l $option $TOPDIR/package/*/{Makefile,Config.*} 2>&- | \
 	    while read line; do
-		echo ${line%/*}/info.mk
+		print -r -- ${line%/*}/info.mk
 	done | while read fname; do
 		[[ $ao = *:$fname:* ]] && continue
 		ao=$ao$fname:
 		echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg/$option" >>$fname
 	done
-	printf '\r%'$x's\r' ''
 done
+pbar=done
+print -u2 "$pbar"
 
 exit 0
-- 
cgit v1.2.3