summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-24 10:30:20 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-24 10:30:20 (GMT)
commit537a2c4eaa446e52c6ba07007eb9ae75998b5580 (patch)
treeb48cc775042b4274dce470527826007de7a7fa84 /scripts
parent18b3987c6d890f02c80b976b6cf6835053ef1fe9 (diff)
parentce621815fecece2b4d8a4cb7115eb82c1cb7ed44 (diff)
Merge commit 'origin/confgen'
finally autogenerate menu Config.in files and Depends.mk for packages. thx mirabilos Conflicts: .gitignore Makefile mk/build.mk package/eglibc/Config.in package/glibc/Config.in package/uclibc++/Config.in package/uclibc/Config.in rules.mk
Diffstat (limited to 'scripts')
-rw-r--r--scripts/scan-tools.sh2
-rw-r--r--scripts/split-cfg.sh31
2 files changed, 17 insertions, 16 deletions
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 7054739..743f316 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -112,7 +112,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
diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh
index 4331709..07cdd58 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