Blame gzip-1.3.12-openbsd-owl-tmp.patch
|
Ivana Varekova |
22bd6d8 |
--- gzip-1.3.12/znew.in.owl-tmp 2007-06-04 09:15:11.000000000 +0200
|
|
Ivana Varekova |
22bd6d8 |
+++ gzip-1.3.12/znew.in 2007-06-04 09:23:18.000000000 +0200
|
|
Ivana Varekova |
39397c8 |
@@ -55,28 +55,27 @@
|
|
Ivana Varekova |
39397c8 |
# block is the disk block size (best guess, need not be exact)
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
warn="(does not preserve modes and timestamp)"
|
|
Ivana Varekova |
22bd6d8 |
-tmp=${TMPDIR-/tmp}/zfoo.$$
|
|
Ivana Varekova |
39397c8 |
-set -C
|
|
Ivana Varekova |
39397c8 |
-echo hi > $tmp || exit
|
|
Ivana Varekova |
39397c8 |
-if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then
|
|
Ivana Varekova |
39397c8 |
- cpmod=${CPMOD-cpmod}
|
|
Ivana Varekova |
22bd6d8 |
+cpmod=
|
|
Ivana Varekova |
22bd6d8 |
+cpmodarg=
|
|
Ivana Varekova |
22bd6d8 |
+if type ${CPMOD:-cpmod} 2>/dev/null; then
|
|
Ivana Varekova |
22bd6d8 |
+ cpmod=${CPMOD:-cpmod}
|
|
Ivana Varekova |
39397c8 |
warn=""
|
|
Ivana Varekova |
39397c8 |
fi
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
-if test -z "$cpmod" && ${TOUCH-touch} -r $tmp $tmp 2>/dev/null; then
|
|
Ivana Varekova |
39397c8 |
- cpmod="${TOUCH-touch}"
|
|
Ivana Varekova |
22bd6d8 |
+if test -z "$cpmod"; then
|
|
Ivana Varekova |
22bd6d8 |
+ cpmod=touch
|
|
Ivana Varekova |
39397c8 |
cpmodarg="-r"
|
|
Ivana Varekova |
39397c8 |
warn="(does not preserve file modes)"
|
|
Ivana Varekova |
39397c8 |
fi
|
|
Ivana Varekova |
39397c8 |
|
|
Ivana Varekova |
39397c8 |
-# check if GZIP env. variable uses -S or --suffix
|
|
Ivana Varekova |
39397c8 |
-gzip -q $tmp
|
|
Ivana Varekova |
39397c8 |
-ext=`echo $tmp* | sed "s|$tmp||"`
|
|
Ivana Varekova |
39397c8 |
-rm -f $tmp*
|
|
Ivana Varekova |
39397c8 |
-if test -z "$ext"; then
|
|
Ivana Varekova |
39397c8 |
- echo znew: error determining gzip extension
|
|
Ivana Varekova |
39397c8 |
- exit 1
|
|
Ivana Varekova |
39397c8 |
-fi
|
|
Ivana Varekova |
22bd6d8 |
+case "$GZIP" in
|
|
Ivana Varekova |
22bd6d8 |
+ *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*\([^[:space:]]*\).*$/\1/'`
|
|
Ivana Varekova |
22bd6d8 |
+ ;;
|
|
Ivana Varekova |
22bd6d8 |
+ *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=\([^[:space:]]*\).*$/\1/'`
|
|
Ivana Varekova |
22bd6d8 |
+ ;;
|
|
Ivana Varekova |
22bd6d8 |
+ *) ext='.gz'
|
|
Ivana Varekova |
22bd6d8 |
+ ;;
|
|
Ivana Varekova |
22bd6d8 |
+esac
|
|
Ivana Varekova |
39397c8 |
if test "$ext" = ".Z"; then
|
|
Ivana Varekova |
39397c8 |
echo znew: cannot use .Z as gzip extension.
|
|
Ivana Varekova |
39397c8 |
exit 1
|