From 959b9db6e555b3403db814a9706c17f614855e73 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 8 Mar 2014 09:07:40 +0100
Subject: [PATCH] switch to 7zip for extract

---
 7z922_extra.7z.sha1sum    |  1 +
 CLIENT_DATA/setup3264.ins |  4 ++--
 builder-product.cfg       | 10 +++++-----
 builder-targets-cb.sh     |  4 ++--
 unz600xn.exe.sha1sum      |  1 -
 5 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 7z922_extra.7z.sha1sum
 delete mode 100644 unz600xn.exe.sha1sum

diff --git a/7z922_extra.7z.sha1sum b/7z922_extra.7z.sha1sum
new file mode 100644
index 0000000..eabfba7
--- /dev/null
+++ b/7z922_extra.7z.sha1sum
@@ -0,0 +1 @@
+64f2be40bc17735ee7dc02119de1238a8afd9455  /home/mario/.opsi-dist-cache/openvpn.config7-0/ALL/7z922_extra.7z
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index ea408db..7cee824 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -123,7 +123,7 @@ endif
 [Dosbatch_install_32]
 @ECHO OFF
 "$WgetExe$" -v --user=$htaccessUSER$ --password=$htaccessPW$ --output-document=$htaccessDEST$ $htaccessURL$/$htaccessFILE$
-"$UnZipExe$" -v "$htaccessDEST$" -d "$InstallDir32$"
+"$7ZipExe$" e -o"$InstallDir32$" "$htaccessDEST$"
 
 [Files_install_32]
 ; copy the ini file to the InstallDir
@@ -136,7 +136,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
 [Dosbatch_install_64]
 @ECHO OFF
 "$WgetExe$" -v --user=$htaccessUSER$ --password=$htaccessPW$ --output-document=$htaccessDEST$ $htaccessURL$/$htaccessFILE$
-"$UnZipExe$" -v "$htaccessDEST$" -d "$InstallDir64$"
+"$7ZipExe$" e -o"$InstallDir64$" "$htaccessDEST$"
 
 [Files_install_64]
 ; copy the ini file to the InstallDir
diff --git a/builder-product.cfg b/builder-product.cfg
index 9cd1a3c..16f8ea8 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -18,10 +18,10 @@ TYPE="public"
 DL_FILE[0]="Vpn_logo.png"
 DL_SOURCE[0]="https://wiki.amahi.org/images/b/b3/Vpn_logo.png"
 
-DL_FILE[1]="unz600xn.exe"
-DL_SOURCE[1]="http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/win32/unz600xn.exe"
+DL_FILE[1]="7z922_extra.7z"
+DL_SOURCE[1]="http://sourceforge.net/projects/sevenzip/files/7-Zip/9.22/7z922_extra.7z"
 DL_ARCH[1]="ALL"
-DL_EXTRACT_FORMAT[1]="unzip"
+DL_EXTRACT_FORMAT[1]="7zip"
 
 DL_FILE[2]="wget-1.15.7z"
 DL_SOURCE[2]="http://sourceforge.net/projects/tumagcc/files/wget-1.15.7z"
@@ -31,8 +31,8 @@ DL_EXTRACT_FORMAT[2]="7zip"
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
-WINST_NAME[0]="UnZipExe"
-WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\unzip.exe"
+WINST_NAME[0]="7ZipExe"
+WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\7za.exe"
 
 WINST_NAME[1]="WgetExe"
 WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\wget.exe"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index c9d2d42..6736f96 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -28,6 +28,6 @@ function create() {
     echo "Create"
     builder_create
 
-	find $INST_DIR/CLIENT_DATA/ALL/ -type f ! -name 'unzip.*' ! -name 'LICENSE' ! -name 'COPYING' ! -name 'wget.*' ! -name 'curl-ca-bundle.crt' -delete
-	rm -rf $INST_DIR/CLIENT_DATA/ALL/locale
+	find $INST_DIR/CLIENT_DATA/ALL/ -type f ! -name '7za.*' ! -name 'LICENSE' ! -name 'COPYING' ! -name 'wget.*' ! -name 'curl-ca-bundle.crt' -delete
+	rm -rf $INST_DIR/CLIENT_DATA/ALL/{locale,FAR,Installer,x64}
 }
diff --git a/unz600xn.exe.sha1sum b/unz600xn.exe.sha1sum
deleted file mode 100644
index 4b8a1a2..0000000
--- a/unz600xn.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-5ae7a23e7abf2c5ca44cefb0d6bf6248e6563db1  /home/mario/.opsi-dist-cache/openvpn.config7-0/ALL/unz600xn.exe