Merge branch 'master' of disconnected-by-peer.at:go-opsi/7zip

CLIENT_DATA/setup.ins

@@ -99,7 +99,7 @@ endif
 ; You can use $LicenseKey$ var to pass a license key to the installer
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-"Install32Exe" /S /D="$InstallDir32$"
+"$Install32Exe$" /S /D="$InstallDir32$"
 "%ScriptPath%\associate.cmd"
 
 [Files_install_32]

builder-targets-cb.sh

@@ -18,43 +18,7 @@
 #  callbacks: <none>
 #
 ##############################################################################
-
-#function config() {
-#    echo "Config - doing some commands before calling the builder_config" 
-#    builder_config
-#    echo "Config - doing some commands after calling the builder_config" 
-#}
-
-#function prepare() { 
-#    echo "Prepare" 
-#    builder_prepare
-#}
-
-function retrieve() { 
-    echo "Retrieve" 
-    builder_retrieve
-}
-
-function create() { 
-    echo  "Create"
-    builder_create
-}
-
-function package() { 
-    echo "Package" 
-    builder_package
-}
-
-function publish() {
-    echo "Publish"
-    builder_publish
-}
-
-function commit() {
-    echo "Commit"
-    # builder_commit
-}
 function cleanup() {
     echo "Cleanup: output_dir: $output_dir"
-    # builder_cleanup
+    builder_cleanup
 }