go-opsi/openvpn.config7
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch to 7zip for extract

Browse Source
This commit is contained in:
Mario Fetka 2014-03-08 09:07:40 +01:00
parent 8bd53e21da
commit 959b9db6e5
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
7z922_extra.7z.sha1sum Normal file
View File

@ -0,0 +1 @@
64f2be40bc17735ee7dc02119de1238a8afd9455 /home/mario/.opsi-dist-cache/openvpn.config7-0/ALL/7z922_extra.7z

4
CLIENT_DATA/setup3264.ins
View File

@ -123,7 +123,7 @@ endif
[Dosbatch_install_32] [Dosbatch_install_32]
@ECHO OFF @ECHO OFF
"$WgetExe$" -v --user=$htaccessUSER$ --password=$htaccessPW$ --output-document=$htaccessDEST$ $htaccessURL$/$htaccessFILE$ "$WgetExe$" -v --user=$htaccessUSER$ --password=$htaccessPW$ --output-document=$htaccessDEST$ $htaccessURL$/$htaccessFILE$
"$UnZipExe$" -v "$htaccessDEST$" -d "$InstallDir32$" "$7ZipExe$" e -o"$InstallDir32$" "$htaccessDEST$"
[Files_install_32] [Files_install_32]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir
@ -136,7 +136,7 @@ copy "$IniCfgFile$" "$InstallDir32$"
[Dosbatch_install_64] [Dosbatch_install_64]
@ECHO OFF @ECHO OFF
"$WgetExe$" -v --user=$htaccessUSER$ --password=$htaccessPW$ --output-document=$htaccessDEST$ $htaccessURL$/$htaccessFILE$ "$WgetExe$" -v --user=$htaccessUSER$ --password=$htaccessPW$ --output-document=$htaccessDEST$ $htaccessURL$/$htaccessFILE$
"$UnZipExe$" -v "$htaccessDEST$" -d "$InstallDir64$" "$7ZipExe$" e -o"$InstallDir64$" "$htaccessDEST$"
[Files_install_64] [Files_install_64]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir

10
builder-product.cfg
View File

@ -18,10 +18,10 @@ TYPE="public"
DL_FILE[0]="Vpn_logo.png" DL_FILE[0]="Vpn_logo.png"
DL_SOURCE[0]="https://wiki.amahi.org/images/b/b3/Vpn_logo.png" DL_SOURCE[0]="https://wiki.amahi.org/images/b/b3/Vpn_logo.png"
DL_FILE[1]="unz600xn.exe" DL_FILE[1]="7z922_extra.7z"
DL_SOURCE[1]="http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/win32/unz600xn.exe" DL_SOURCE[1]="http://sourceforge.net/projects/sevenzip/files/7-Zip/9.22/7z922_extra.7z"
DL_ARCH[1]="ALL" DL_ARCH[1]="ALL"
DL_EXTRACT_FORMAT[1]="unzip" DL_EXTRACT_FORMAT[1]="7zip"
DL_FILE[2]="wget-1.15.7z" DL_FILE[2]="wget-1.15.7z"
DL_SOURCE[2]="http://sourceforge.net/projects/tumagcc/files/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 # File array index for the image showing while installing the program
ICON_DL_INDEX=0 ICON_DL_INDEX=0
WINST_NAME[0]="UnZipExe" WINST_NAME[0]="7ZipExe"
WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\unzip.exe" WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\7za.exe"
WINST_NAME[1]="WgetExe" WINST_NAME[1]="WgetExe"
WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\wget.exe" WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\wget.exe"

4
builder-targets-cb.sh
View File

@ -28,6 +28,6 @@ function create() {
echo "Create" echo "Create"
builder_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 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 rm -rf $INST_DIR/CLIENT_DATA/ALL/{locale,FAR,Installer,x64}
} }

1
unz600xn.exe.sha1sum
View File

@ -1 +0,0 @@
5ae7a23e7abf2c5ca44cefb0d6bf6248e6563db1 /home/mario/.opsi-dist-cache/openvpn.config7-0/ALL/unz600xn.exe