Modified tmviewer for new opsi-builder

CLIENT_DATA/setup32.ins

@@ -19,13 +19,16 @@ DefVar $LicensePool$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
+; Token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+@@BUILDER_VARIABLES@@
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $ProductId$       = "tmviewer"
+Set $ProductId$       = $PN$
 Set $MinimumSpace$    = "30 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\SoftMaker Viewer\TextMaker"
@@ -39,7 +42,7 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
-	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+	ShowBitmap "" + $IconFile$ $ProductId$
 	
 	if FileExists("%ScriptPath%\delsub32.ins")
 		comment "Start uninstall sub section"
@@ -87,7 +90,7 @@ endif
 ;
 ; === MSI package =======================================================================================
 ; You may use the parameter PIDKEY=$Licensekey$
-msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
 ;
 
 [Files_install]

CLIENT_DATA/uninstall32.ins

@@ -17,10 +17,13 @@ DefVar $LicensePool$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
+; Token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+@@BUILDER_VARIABLES@@
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $ProductId$       = "tmviewer"
+Set $ProductId$       = $PN$
 Set $InstallDir$      = "%ProgramFiles32Dir%\SoftMaker Viewer\TextMaker"
 Set $LicenseRequired$ = "false"
 Set $LicensePool$     = "p_" + $ProductId$
@@ -28,7 +31,7 @@ Set $LicensePool$     = "p_" + $ProductId$
 
 
 comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap $IconFile$  $ProductId$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 

build.sh

@@ -1,121 +0,0 @@
-#!/bin/sh
-PN="tmviewer"
-VERSION="2010"
-RELEASE="10"
-PRIORITY="0"
-ADVICE=""
-TYPE="restrict"
-# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
-ICON="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
-X86="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/TextMakerViewer2010.msi"
-#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
-

builder-product.cfg

@@ -9,7 +9,7 @@ PRIORITY="0"
 ADVICE=""
 
 TYPE="public"
-STATUS="testing"
+STATUS="integration"
 
 
 #####################
@@ -18,18 +18,17 @@ STATUS="testing"
 
 FILE[0]="SoftMaker-Logo.png_medium.png"
 SOURCE[0]="http://www.android-user.de/var/ezflow_site/storage/images/artikel/exklusiv-vorschau-auf-softmaker-office-fuer-android/softmaker-logo.png/25888-1-ger-DE/SoftMaker-Logo.png_medium.png"
-WINST[0]=IconFile
 
-#FILE[1]="TextMakerViewer2010.msi"
+FILE[1]="TextMakerViewer2010.msi"
-#SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/TextMakerViewer2010.msi"
+SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/SoftMaker/Viewer/HB/2010/TextMakerViewer2010.msi"
-#ARCH[1]="X86"
-#WINST[1]="InstallMsi"
-
-FILE[1]="TMViewerSetup.exe"
-SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
 ARCH[1]="X86"
-WINST[1]="InstallExe"
+WINST[1]="InstallMsi"
 
+# Download direct the executable
+#FILE[1]="TMViewerSetup.exe"
+#SOURCE[1]="http://www.softmaker.net/down/TMViewerSetup.exe"
+#ARCH[1]="X86"
+#WINST[1]="InstallExe"
 
 # File array index for the image showing while installing the program
 ICON_FILE_INDEX=0

builder-targets-cb.sh

@@ -13,6 +13,10 @@ function create() {
 }
 
 function cleanup() {
-    echo "Cleanup: output_dir: $output_dir"
+    echo "Cleanup:"
+    
+    cp -av ${OPSI_REPOS_PRODUCT_DIR}/${OPSI_REPOS_FILE_PATTERN} /tmp
+    chmod 666 /tmp/${OPSI_REPOS_FILE_PATTERN}
+
     # builder_cleanup
 }