Tweek release scripts

scripts/upload.sh

@@ -1,14 +1,25 @@
 #!/bin/bash
+cd "release-$1"
 wget http://support.googlecode.com/svn/trunk/scripts/googlecode_upload.py -O googlecode_upload.py
 
 function ul() {
-	source upload.conf
+	source ../upload.conf
 	python googlecode_upload.py -u "$USER" -w "$PASS" -s "$1" -p "wkhtmltopdf" -l "$2" "$3"
 }
 
-ul "wkhtmltopdf-$1 Source" "Type-Source,OpSys-All,Featured" "release-$1/wkhtmltopdf-$1.tar.bz2"
-ul "wkhtmltopdf-$1 Linux Static Binary (i368)" "Type-Executable,OpSys-Linux,Featured" "release-$1/wkhtmltopdf-$1-static-i386.tar.bz2"
-ul "wkhtmltopdf-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Featured" "release-$1/wkhtmltopdf-$1-static-amd64.tar.bz2"
-ul "wkhtmltox-$1 Windows Installer (i368)" "Type-Installer,OpSys-Windows,Featured" "release-$1/wkhtmltox-$1-installer.exe"
-ul "wkhtmltoimage-$1 Linux Static Binary (i368)" "Type-Executable,OpSys-Linux,Featured" "release-$1/wkhtmltoimage-$1-static-i386.tar.bz2"
-ul "wkhtmltoimage-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Featured" "release-$1/wkhtmltoimage-$1-static-amd64.tar.bz2"
+if ! [ -f "wkhtmltopdf-$1.tar.bz2" ] || 
+   ! [ -f "wkhtmltopdf-$1-static-i386.tar.bz2" ] ||
+   ! [ -f "wkhtmltopdf-$1-static-amd64.tar.bz2" ] || 
+   ! [ -f "wkhtmltox-$1-installer.exe" ] || 
+   ! [ -f "wkhtmltoimage-$1-static-i386.tar.bz2" ] ||
+   ! [ -f "wkhtmltoimage-$1-static-amd64.tar.bz2" ]; then
+	echo "File Missing"
+	exit 1
+fi
+
+ul "wkhtmltopdf-$1 Source" "Type-Source,OpSys-All,Featured" "wkhtmltopdf-$1.tar.bz2"
+ul "wkhtmltopdf-$1 Linux Static Binary (i368)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltopdf-$1-static-i386.tar.bz2"
+ul "wkhtmltopdf-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltopdf-$1-static-amd64.tar.bz2"
+ul "wkhtmltox-$1 Windows Installer (i368)" "Type-Installer,OpSys-Windows,Featured" "wkhtmltox-$1-installer.exe"
+ul "wkhtmltoimage-$1 Linux Static Binary (i368)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltoimage-$1-static-i386.tar.bz2"
+ul "wkhtmltoimage-$1 Linux Static Binary (amd64)" "Type-Executable,OpSys-Linux,Featured" "wkhtmltoimage-$1-static-amd64.tar.bz2"

wkhtmltopdf.nsi.m4

@@ -1,8 +1,8 @@
 !include "MUI2.nsh"
 !include "EnvVarUpdate.nsh"
 
-Name "wkhtmltopdf WKVERSION"
-OutFile "wkhtmltopdf-WKVERSION-installer.exe"
+Name "wkhtmltox WKVERSION"
+OutFile "wkhtmltox-WKVERSION-installer.exe"
 
 RequestExecutionLevel admin