From 8bd53e21da0550a6f6a17e49f70a9306b9d7295f Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 8 Mar 2014 08:22:29 +0100
Subject: [PATCH] switch back to wget

---
 CLIENT_DATA/setup3264.ins | 77 ++-------------------------------------
 builder-product.cfg       |  8 ++++
 builder-targets-cb.sh     |  3 +-
 wget-1.15.7z.sha1sum      |  1 +
 4 files changed, 15 insertions(+), 74 deletions(-)
 create mode 100644 wget-1.15.7z.sha1sum

diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 15b1436..ea408db 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -94,7 +94,6 @@ else
 		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
-		ExecWith_cscript_download "cscript" "//E:VBS"
 		comment "Copy files"
 		Files_install_32 /32Bit
 		Dosbatch_install_32
@@ -109,7 +108,6 @@ else
 		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
-		ExecWith_cscript_download "cscript" "//E:VBS"
 		comment "Copy files"
 		Files_install_64 /64Bit
 		Dosbatch_install_64
@@ -122,78 +120,9 @@ else
 	
 endif
 
-[ExecWith_cscript_download]
-'======================================================================
-' http-download.vbs 1.0 @2011 by Frank4dd http://www.frank4dd.com/howto
-' This script demonstrates a file download from a webserver using http(s).
-' It can easily be extended for using basic web authentication.
-'
-' This program comes with ABSOLUTELY NO WARRANTY. You may redistribute
-' copies of it under the terms of the GNU General Public License.
-'======================================================================
-
-'======================================================================
-' Global Constants and Variables
-'======================================================================
-Const scriptVer  = "1.0"
-Const DownloadDest = "$htaccessURL$/$htaccessFILE$"
-Const LocalFile = "$htaccessDEST$"
-Const webUser = "$htaccessUSER$"
-Const webPass = "$htaccessPW$"
-Const DownloadType = "binary"
-dim strURL
-
-function getit()
-  dim xmlhttp
-
-  set xmlhttp=createobject("MSXML2.XMLHTTP.3.0")
-  'xmlhttp.SetOption(2, 13056) 'If url https -> Ignore all SSL errors
-  strURL = DownloadDest
-  'msgbox "Download-URL: " & strURL
-
-  'For basic auth, use the line below together with user+pass variables above
-  xmlhttp.Open "GET", strURL, false, webUser, webPass
-  'xmlhttp.Open "GET", strURL, false
-
-  xmlhttp.Send
-  ' Wscript.Echo "Download-Status: " & xmlhttp.Status & " " & xmlhttp.statusText
-  
-  If xmlhttp.Status = 200 Then
-    Dim objStream
-    set objStream = CreateObject("ADODB.Stream")
-    objStream.Type = 1 'adTypeBinary
-    objStream.Open
-    objStream.Write xmlhttp.responseBody
-    objStream.SaveToFile LocalFile
-    objStream.Close
-    set objStream = Nothing
-  End If
-
-
-  set xmlhttp=Nothing
-End function 
-
-'=======================================================================
-' End Function Defs, Start Main
-'=======================================================================
-' Deactivated for Silent
-' Get cmdline params and initialize variables
-' If Wscript.Arguments.Named.Exists("h") Then
-'   Wscript.Echo "Usage: http-download.vbs"
-'   Wscript.Echo "version " & scriptVer
-'   WScript.Quit(intOK)
-' End If
-
-getit()
-' Deactivated for Silent
-' Wscript.Echo "Download Complete. See " & LocalFile & " for success."
-' Wscript.Quit(intOK)
-'=======================================================================
-' End Main
-'=======================================================================
-
-
 [Dosbatch_install_32]
+@ECHO OFF
+"$WgetExe$" -v --user=$htaccessUSER$ --password=$htaccessPW$ --output-document=$htaccessDEST$ $htaccessURL$/$htaccessFILE$
 "$UnZipExe$" -v "$htaccessDEST$" -d "$InstallDir32$"
 
 [Files_install_32]
@@ -205,6 +134,8 @@ copy "$IniCfgFile$" "$InstallDir32$"
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
 
 [Dosbatch_install_64]
+@ECHO OFF
+"$WgetExe$" -v --user=$htaccessUSER$ --password=$htaccessPW$ --output-document=$htaccessDEST$ $htaccessURL$/$htaccessFILE$
 "$UnZipExe$" -v "$htaccessDEST$" -d "$InstallDir64$"
 
 [Files_install_64]
diff --git a/builder-product.cfg b/builder-product.cfg
index e97f56f..9cd1a3c 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -23,12 +23,20 @@ DL_SOURCE[1]="http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/wi
 DL_ARCH[1]="ALL"
 DL_EXTRACT_FORMAT[1]="unzip"
 
+DL_FILE[2]="wget-1.15.7z"
+DL_SOURCE[2]="http://sourceforge.net/projects/tumagcc/files/wget-1.15.7z"
+DL_ARCH[2]="ALL"
+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[1]="WgetExe"
+WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\wget.exe"
+
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="UninstallProg32"
 OPSI_INI_VALUE[0]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 40af334..c9d2d42 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -28,5 +28,6 @@ function create() {
     echo "Create"
     builder_create
 
-	find $INST_DIR/CLIENT_DATA/ALL/ -type f ! -name 'unzip.*' ! -name 'LICENSE' -delete
+	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
 }
diff --git a/wget-1.15.7z.sha1sum b/wget-1.15.7z.sha1sum
new file mode 100644
index 0000000..ccd566e
--- /dev/null
+++ b/wget-1.15.7z.sha1sum
@@ -0,0 +1 @@
+3428b67b9104b7ac7ea9634200cdf101344b04a4  /home/mario/.opsi-dist-cache/openvpn.config7-0/ALL/wget-1.15.7z