projects
/
openwrt
/
svn-archive
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a0699b0
)
Merge r16390 (debian tar.gz fix) to 8.09
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 15 Jul 2009 20:45:43 +0000
(20:45 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 15 Jul 2009 20:45:43 +0000
(20:45 +0000)
SVN-Revision: 16854
scripts/ipkg
patch
|
blob
|
history
diff --git
a/scripts/ipkg
b/scripts/ipkg
index 18090be3e611fd8d76b72c14b6379608f669f554..554521a813f7731223aca485f506cdab588befdc 100755
(executable)
--- a/
scripts/ipkg
+++ b/
scripts/ipkg
@@
-773,7
+773,7
@@
ipkg_install_file_dest() {
mkdir -p $IPKG_TMP/$pkg/data
mkdir -p $info_dir
mkdir -p $IPKG_TMP/$pkg/data
mkdir -p $info_dir
- if ! $pkg_extract_stdout $filename ./control.tar.gz | (cd $IPKG_TMP/$pkg/control;
tar -xz
f - ) ; then
+ if ! $pkg_extract_stdout $filename ./control.tar.gz | (cd $IPKG_TMP/$pkg/control;
zcat | tar -x
f - ) ; then
echo "ipkg_install_file: ERROR unpacking control.tar.gz from $filename"
return 1
fi
echo "ipkg_install_file: ERROR unpacking control.tar.gz from $filename"
return 1
fi
@@
-803,7
+803,7
@@
Status: install ok pending" | ipkg_status_update_sd $sd $pkg
set -o noglob
rm -r $IPKG_TMP/$pkg/control
set -o noglob
rm -r $IPKG_TMP/$pkg/control
- if ! $pkg_extract_stdout $filename ./data.tar.gz | (cd $IPKG_TMP/$pkg/data;
tar -xz
f - ) ; then
+ if ! $pkg_extract_stdout $filename ./data.tar.gz | (cd $IPKG_TMP/$pkg/data;
zcat | tar -x
f - ) ; then
echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename"
return 1
fi
echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename"
return 1
fi
@@
-875,7
+875,7
@@
diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"
rm -rf $IPKG_TMP/$pkg/data
rmdir $IPKG_TMP/$pkg
rm -f $info_dir/$pkg.list
rm -rf $IPKG_TMP/$pkg/data
rmdir $IPKG_TMP/$pkg
rm -f $info_dir/$pkg.list
- $pkg_extract_stdout $filename ./data.tar.gz |
tar tz
f - | sed -e 's/^\.//' > $info_dir/$pkg.list
+ $pkg_extract_stdout $filename ./data.tar.gz |
zcat | tar t
f - | sed -e 's/^\.//' > $info_dir/$pkg.list
if [ -x "$info_dir/$pkg.postinst" ]; then
$info_dir/$pkg.postinst configure
if [ -x "$info_dir/$pkg.postinst" ]; then
$info_dir/$pkg.postinst configure