Installer:

[people/teissler/ipfire-2.x.git] / src / scripts / make-packages.sh

diff --git a/src/scripts/make-packages.sh b/src/scripts/make-packages.sh
index 3a3dcc536366a578945ae7ab10a04bde3225f3af..f848be7215bf973eeba7d9376fa68f3d62dd7357 100755 (executable)
--- a/src/scripts/make-packages.sh
+++ b/src/scripts/make-packages.sh
@@ -7,20 +7,22 @@
 ##                                                           ##
 ########################################################
 echo "`date -u '+%b %e %T'`: Packing $1" | tee -a $LOGFILE
-cd / && mkdir -p /paks/$1
+cd / && mkdir -p /paks/$1/ROOT
 
 ## Copy install.sh/uninstall.sh to pak-dir and make executeable
 #
 cp -f /usr/src/src/paks/$1/{,un}install.sh /paks/$1
 chmod 755 /paks/$1/{,un}install.sh
 
-tar cvfz /paks/$1/files.tgz --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
+# This tar+untar+tar is for removing files compressed twice
+tar -c -C / --files-from=/usr/src/src/paks/$1/ROOTFILES -f /paks/$1/filestmp.tar --exclude=#*
+tar -x -C /paks/$1/ROOT -f /paks/$1/filestmp.tar
+rm -f /paks/$1/filestmp.tar
+cd /paks/$1/ROOT && tar zcf /paks/$1/files.tgz *
 
-tar cvfz /paks/$1/conf.tgz  --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
+cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz install.sh uninstall.sh
+cd .. && md5sum $2.tar.gz > $2.tar.gz.md5
 
-cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh
-cd .. && md5sum $2.tar.gz >> $2.tar.gz.md5
-
-rm -r /paks/$1
+rm -fr /paks/$1
 
 exit 0
\ No newline at end of file