Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/applets/usage_compressed

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/applets/usage_compressed (modified) (1 diff)

branches/2.2.9/mindi-busybox/applets/usage_compressed

@@ -8 +8 @@
 test -x "$loc/usage" || exit 1
 test "$SED" || SED=sed
+test "$DD" || DD=dd
 
-sz=`"$loc/usage" | wc -c` || exit 1
+# Some people were bitten by their system lacking a (proper) od
+od -v -t x1 </dev/null >/dev/null
+if test $? != 0; then
+    echo 'od tool is not installed or cannot accept "-v -t x1" options'
+    exit 1
+fi
 
-exec >"$target"
+exec >"$target.$$"
 
-echo 'static const char packed_usage[] ALIGN1 = '
-"$loc/usage" | bzip2 -1 | od -v -t x1 \
-| $SED -e 's/^[^ ]*//' -e 's/  *\(..\)/\\x\1/g' -e 's/^\(.*\)$/"\1"/'
-echo ';'
-echo '#define SIZEOF_usage_messages' `expr 0 + $sz`
+echo '#define UNPACKED_USAGE "" \'
+"$loc/usage" | od -v -t x1 \
+| $SED -e 's/^[^ ]*//' \
+    -e 's/ //g' \
+    -e '/^$/d' \
+    -e 's/\(..\)/\\x\1/g' \
+    -e 's/^/"/' \
+    -e 's/$/" \\/'
+echo ''
+
+echo '#define PACKED_USAGE \'
+## Breaks on big-endian systems!
+## # Extra effort to avoid using "od -t x1": -t is not available
+## # in non-CONFIG_DESKTOPed busybox od
+##
+## "$loc/usage" | bzip2 -1 | od -v -x \
+## | $SED -e 's/^[^ ]*//' \
+##  -e 's/ //g' \
+##  -e '/^$/d' \
+##  -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
+##  -e 's/$/ \\/'
+"$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -t x1 \
+| $SED -e 's/^[^ ]*//' \
+    -e 's/ //g' \
+    -e '/^$/d' \
+    -e 's/\(..\)/0x\1,/g' \
+    -e 's/$/ \\/'
+echo ''
+
+mv -- "$target.$$" "$target"