From 39711c3eddb56745904f44db2d86ab12c2518f89 Mon Sep 17 00:00:00 2001
From: DT Netsolution GmbH <opsi-dbp@service3.dtnet.de>
Date: Fri, 27 Jan 2012 02:32:17 +0100
Subject: [PATCH] - Umgestellt auf neuen builder - fix im uninstaller

---
 CLIENT_DATA/delsub32.ins    |   2 +-
 CLIENT_DATA/setup32.ins     |   5 +-
 CLIENT_DATA/uninstall32.ins |   1 +
 build.sh                    | 121 ------------------------------------
 4 files changed, 6 insertions(+), 123 deletions(-)
 delete mode 100644 build.sh

diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 8c2da50..79daa59 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -5,7 +5,7 @@
 
 
 Set $MsiId$ = '{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}'
-Set $UninstallProgram$ = $InstallDir$ + "\unistall.exe"
+Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe"
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 5cb5ee9..d4db6ec 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -19,6 +19,9 @@ DefVar $LicensePool$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
+; Token BUILDER_VARIABLES will be replace by builder.sh
+@@BUILDER_VARIABLES@@
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
@@ -81,7 +84,7 @@ endif
 ; Choose one of the following examples as basis for your installation
 ; You can use $LicenseKey$ var to pass a license key to the installer
 ;
-"%ScriptPath%\X86FILE" /S
+"$InstallerExe$" /S
 
 [Files_install]
 ; Example of recursively copying some files into the installation directory:
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index f95bb66..ee35b3c 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -17,6 +17,7 @@ DefVar $LicensePool$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
diff --git a/build.sh b/build.sh
deleted file mode 100644
index 7007572..0000000
--- a/build.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-PN="notepadpp"
-VERSION="5.9.8"
-RELEASE="1"
-PRIORITY="0"
-ADVICE=""
-TYPE="public"
-# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
-ICON="http://www.haririalghazir.com/wp-content/uploads/2011/03/notepad.png"
-X86="http://download.tuxfamily.org/notepadplus/${VERSION}/npp.${VERSION}.Installer.exe"
-#AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi"
-ICONFILE=${ICON##*/}
-X86FILE=${X86##*/}
-#AMD64FILE=${AMD64##*/}
-
-	if [ -e /var/tmp/opsi/upload/$TYPE/${PN}_${VERSION}-${RELEASE}.opsi ]
-	then
-		echo "package ${PN}_${VERSION}-${RELEASE}.opsi already generated"
-		exit 1
-	fi
-
-OUT=$(mktemp -d /tmp/output.XXXXXXXXXX) || { echo "Failed to create temp dir"; exit 1; }
-mkdir $OUT/$PN
-cp -Rv OPSI CLIENT_DATA $OUT/$PN
-unix2dos $OUT/$PN/CLIENT_DATA/*
-
-	if [ -e /usr/portage/distfiles/$ICONFILE ]
-	then
-		if [ -e $ICONFILE.sha1sum ]
-		then
-			SHA1SUM=`cat $ICONFILE.sha1sum`
-			CHECKSUM=`sha1sum /usr/portage/distfiles/$ICONFILE`
-			if [ "$CHECKSUM" = "$SHA1SUM" ]
-			then
-				convert -colorspace rgb /usr/portage/distfiles/$ICONFILE -transparent white -background transparent -resize 160x160\> \
-					-size 160x160 xc:transparent +swap -gravity center -composite $OUT/$PN/CLIENT_DATA/$PN.png
-			else
-				echo "The checksums do not match."
-				exit 1
-			fi
-		else
-			echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$ICONFILE > $ICONFILE.sha1sum"
-			exit 1
-		fi
-	else
-		echo "Downloading file"
-		wget -P /usr/portage/distfiles/ $ICON
-		exit 1
-	fi
-
-	if [ -e /usr/portage/distfiles/$X86FILE ]
-	then
-		if [ -e $X86FILE.sha1sum ]
-		then
-			SHA1SUM=`cat $X86FILE.sha1sum`
-			CHECKSUM=`sha1sum /usr/portage/distfiles/$X86FILE`
-			if [ "$CHECKSUM" = "$SHA1SUM" ]
-			then
-				cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA
-			else
-				echo "The checksums do not match."
-				exit 1
-			fi
-		else
-			echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$X86FILE > $X86FILE.sha1sum"
-			exit 1
-		fi
-	else
-		echo "Downloading file"
-		wget -O /usr/portage/distfiles/$X86FILE $X86
-		exit 1
-	fi
-
-#	if [ -e /usr/portage/distfiles/$AMD64FILE ]
-#	then
-#		if [ -e $AMD64FILE.sha1sum ]
-#		then
-#			SHA1SUM=`cat $AMD64FILE.sha1sum`
-#			CHECKSUM=`sha1sum /usr/portage/distfiles/$AMD64FILE`
-#			if [ "$CHECKSUM" = "$SHA1SUM" ]
-#			then
-#				cp /usr/portage/distfiles/$AMD64FILE $OUT/$PN/CLIENT_DATA
-#			else
-#				echo "The checksums do not match." 
-#				exit 1
-#			fi
-#		else
-#			echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$AMD64FILE > $AMD64FILE.sha1sum"
-#			exit 1
-#		fi
-#	else
-#		echo "Downloading file"
-#		wget -P /usr/portage/distfiles/ $AMD64
-#		exit 1
-#	fi
-
-sed -e "s!VERSION!$VERSION!g" -e "s!RELEASE!$RELEASE!g" -e "s!PRIORITY!$PRIORITY!g" -e "s!ADVICE!$ADVICE!g" -i $OUT/$PN/OPSI/control
-#sed -e "s!X86FILE!$X86FILE!g" -e "s!AMD64FILE!$AMD64FILE!g" -i $OUT/$PN/CLIENT_DATA/setup.ins
-sed -e "s!X86FILE!$X86FILE!g" -i $OUT/$PN/CLIENT_DATA/setup32.ins
-
-if test -d ".git"; then
-    git log --date-order --date=short | \
-    sed -e '/^commit.*$/d' | \
-    awk '/^Author/ {sub(/\\$/,""); getline t; print $0 t; next}; 1' | \
-    sed -e 's/^Author: //g' | \
-    sed -e 's/>Date:   \([0-9]*-[0-9]*-[0-9]*\)/>\t\1/g' | \
-    sed -e 's/^\(.*\) \(\)\t\(.*\)/\3    \1    \2/g' > $OUT/$PN/OPSI/changelog.txt
-else
-    echo "No git repository present."
-    exit 1
-fi
-
-pushd $OUT
-opsi-makeproductfile -v $OUT/$PN
-popd
-
-mkdir -p /var/tmp/opsi/upload/$TYPE/
-cp -afv $OUT/*.opsi /var/tmp/opsi/upload/$TYPE/
-
-#rm -rf $OUT
-