[IPCop-cvs] ipcop/updates/1.4.3 setup,1.1.2.4,1.1.2.5

[Gilles E. <ges...@us...>]

Update of /cvsroot/ipcop/ipcop/updates/1.4.3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22849/updates/1.4.3

Modified Files:
      Tag: IPCOP_v1_4_0
	setup 
Log Message:
Use two variable in patch setup instead of multiple numbers occurences

Don't try to hack /var/ipcop/patched/installed inside the patch update,
or it will fail to transfer content of information from available to
installed file.



Index: setup
===================================================================
RCS file: /cvsroot/ipcop/ipcop/updates/1.4.3/Attic/setup,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** setup	18 Dec 2004 18:11:53 -0000	1.1.2.4
--- setup	30 Dec 2004 21:53:41 -0000	1.1.2.5
***************
*** 1,14 ****
  #!/bin/sh
  
! echo "This is the 1.4.3 update patch for IPCop 1.4.2 installing."
  
  CURRENTVERSION=`cat /etc/issue | awk '{ print $2 }' | sed -e 's/v//'`
- UPGRADEVERSION="1.4.3"
  
! if [ "$CURRENTVERSION" != "1.4.2" -a "$CURRENTVERSION" != "1.4.3" ]; then
! 	echo "You are not running IPCop v1.4.2 for this patch to install."
  	echo "Aborting installation."
  	exit -1
  fi
  /bin/sed -i -e "s+= '1.4.*$+= '$UPGRADEVERSION';+" /var/ipcop/header.pl
  /bin/tar -zxpf patch.tar.gz -C /
--- 1,16 ----
  #!/bin/sh
  
! UPGRADEVERSION="1.4.3"
! PREVIOUSVERSION="1.4.2"
! echo "This is the $UPGRADEVERSION update patch for IPCop $PREVIOUSVERSION installing."
  
  CURRENTVERSION=`cat /etc/issue | awk '{ print $2 }' | sed -e 's/v//'`
  
! if [ "$CURRENTVERSION" != "$PREVIOUSVERSION" -a "$CURRENTVERSION" != "$UPGRADEVERSION" ]; then
! 	echo "You are not running IPCop v$PREVIOUSVERSION for this patch to install."
  	echo "Aborting installation."
  	exit -1
  fi
+ 
  /bin/sed -i -e "s+= '1.4.*$+= '$UPGRADEVERSION';+" /var/ipcop/header.pl
  /bin/tar -zxpf patch.tar.gz -C /