From a833e9f73b7be8d07e3aac8dd78b3055dc3b4348 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 28 May 2010 00:56:07 +0100
Subject: [PATCH] Fix installer to download get_iplayer from www.infradead.org

And don't tie its version number to get_iplayer, if that's how it works.
---
 make-nsis.sh                              | 6 +-----
 windows/get_iplayer/get_iplayer_setup.nsi | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/make-nsis.sh b/make-nsis.sh
index e539a2b4..1b041d0d 100755
--- a/make-nsis.sh
+++ b/make-nsis.sh
@@ -10,16 +10,12 @@ if [ ! -r perlfiles.tar.gz ]; then
 fi
 
 NSISDIR=`mktemp -d /tmp/gipXXXXXX`
-VERSION=`./get_iplayer --help | head -1 | cut -f1 -d, | cut -f2 -dv`
 
 cp -av windows/get_iplayer windows/installer_files $NSISDIR
 tar xvfz perlfiles.tar.gz -C $NSISDIR/get_iplayer
-cp get_iplayer $NSISDIR/get_iplayer/get_iplayer.pl
-cp get_iplayer.cgi $NSISDIR/get_iplayer/get_iplayer.cgi
-sed "s/\(!define VERSION\).*/\1 \"$VERSION\"/" -i $NSISDIR/get_iplayer/get_iplayer_setup.nsi
 mkdir -p $NSISDIR/get_iplayer/Downloads
 cd $NSISDIR
 makensis -NOCD get_iplayer/get_iplayer_setup.nsi
 cd -
-mv $NSISDIR/get_iplayer_setup_${VERSION}.exe .
+mv -v $NSISDIR/get_iplayer_setup_*.exe .
 rm -rf $NSISDIR
diff --git a/windows/get_iplayer/get_iplayer_setup.nsi b/windows/get_iplayer/get_iplayer_setup.nsi
index 26b4b46a..bb4c526d 100644
--- a/windows/get_iplayer/get_iplayer_setup.nsi
+++ b/windows/get_iplayer/get_iplayer_setup.nsi
@@ -1,7 +1,7 @@
 ;Product Info
 Name "get_iplayer"
 !define PRODUCT "get_iplayer"
-!define VERSION "3.0a+" 
+!define VERSION "4.0" 
 
  !include "MUI.nsh"
  !include "Sections.nsh"
@@ -68,10 +68,10 @@ Section "get_iplayer" section1
 
   ;download get_iplayer
   Delete $INSTDIR\get_iplayer.pl
-  NSISdl::download http://github.com/jjl/get_iplayer/raw/master/get_iplayer $INSTDIR\get_iplayer.pl
+  NSISdl::download http://www.infradead.org/get_iplayer/get_iplayer $INSTDIR\get_iplayer.pl
 
   ;download get_iplayer.cgi
-  NSISdl::download http://github.com/jjl/get_iplayer/raw/master/get_iplayer.cgi $INSTDIR\get_iplayer.cgi
+  NSISdl::download http://www.infradead.org/get_iplayer/get_iplayer.cgi $INSTDIR\get_iplayer.cgi
 
   ;startmenu
   CreateDirectory "$SMPROGRAMS\get_iplayer"