Skip to content

E
etersoft-build-utils
Commit 9c7eb885 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmgs: fix zip/7z/rar converting

parent 1168dd0c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
bin/rpmgs
View file @ 9c7eb885
...@@ -141,7 +141,7 @@ function get_zip() ...@@ -141,7 +141,7 @@ function get_zip()
get_archive zip || return get_archive zip || return
mkdir $WEXT.zip.dir || return mkdir $WEXT.zip.dir || return
cd $WEXT.zip.dir cd $WEXT.zip.dir
unzip -q ../$WEXT.zip && tar cf ../$WEXT.tar . || { rm -fv $WEXT.zip ; return 1; } unzip -q ../$WEXT.zip && tar cf ../$WEXT.tar ./* || { rm -fv $WEXT.zip ; return 1; }
cd .. cd ..
rm -rf $WEXT.zip.dir rm -rf $WEXT.zip.dir
} }
...@@ -154,7 +154,7 @@ function get_rar() ...@@ -154,7 +154,7 @@ function get_rar()
get_archive rar || return get_archive rar || return
mkdir $WEXT.rar.dir || return mkdir $WEXT.rar.dir || return
cd $WEXT.rar.dir cd $WEXT.rar.dir
$UNRAR x ../$WEXT.rar && tar cf ../$WEXT.tar . || { rm -fv $WEXT.rar ; return 1; } $UNRAR x ../$WEXT.rar && tar cf ../$WEXT.tar ./* || { rm -fv $WEXT.rar ; return 1; }
cd .. cd ..
rm -rf $WEXT.rar.dir rm -rf $WEXT.rar.dir
} }
...@@ -167,7 +167,7 @@ function get_7z() ...@@ -167,7 +167,7 @@ function get_7z()
get_archive 7z || return get_archive 7z || return
mkdir $WEXT.7z.dir || return mkdir $WEXT.7z.dir || return
cd $WEXT.7z.dir cd $WEXT.7z.dir
$BIN7ZIP x ../$WEXT.7z && tar cf ../$WEXT.tar . || { rm -fv $WEXT.7z ; return 1; } $BIN7ZIP x ../$WEXT.7z && tar cf ../$WEXT.tar ./* || { rm -fv $WEXT.7z ; return 1; }
cd .. cd ..
rm -rf $WEXT.7z.dir rm -rf $WEXT.7z.dir
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment