[Tinyos-commits] CVS: tinyos-1.x/tools/release tinyos.spec, 1.19, 1.20

[Kristin Wright]

Update of /cvsroot/tinyos/tinyos-1.x/tools/release
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9946

Modified Files:
	tinyos.spec 
Log Message:
merged in 1.1.15 change (checking for 1.2 or 1.1 locate-jre script)

Index: tinyos.spec
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/release/tinyos.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tinyos.spec	28 Dec 2005 23:46:21 -0000	1.19
--- tinyos.spec	29 Dec 2005 17:19:19 -0000	1.20
***************
*** 44,47 ****
--- 44,60 ----
    RPM_INSTALL_PREFIX=/opt
  fi
+ 
+ # Find 1.x or 2.x version of locate-jre
+ if [ -f /usr/bin/tos-locate-jre ]; then
+   locjrescript=/usr/bin/tos-locate-jre
+ elif [ -f /usr/local/bin/locate-jre ]; then
+   locjrescript=/usr/local/bin/locate-jre
+ else
+   locjrescript=`which locate-jre 2>/dev/null`
+   if [ -z $locjrescript ]; then
+      locjrescript=`which tos-locate-jre 2>/dev/null`	
+   fi
+ fi
+ 
  sed -e "s#@prefix@#$RPM_INSTALL_PREFIX#" <<'EOF' >/etc/profile.d/tinyos.sh
  # script for profile.d for bash shells, adjusted for each users
***************
*** 57,64 ****
  MAKERULES="$TOSROOT/tools/make/Makerules"
  export MAKERULES
  
  # Extend path for java
! type java >/dev/null 2>/dev/null || PATH=`/usr/local/bin/locate-jre --java`:$PATH
! type javac >/dev/null 2>/dev/null || PATH=`/usr/local/bin/locate-jre --javac`:$PATH
  echo $PATH | grep -q /usr/local/bin ||  PATH=/usr/local/bin:$PATH
  EOF
--- 70,79 ----
  MAKERULES="$TOSROOT/tools/make/Makerules"
  export MAKERULES
+ EOF
  
  # Extend path for java
! sed -e "s#@locjre@#$locjrescript#" <<'EOF' >>/etc/profile.d/tinyos.sh
! type java >/dev/null 2>/dev/null || PATH=`@locjre@ --java`:$PATH
! type javac >/dev/null 2>/dev/null || PATH=`@locjre@ --javac`:$PATH
  echo $PATH | grep -q /usr/local/bin ||  PATH=/usr/local/bin:$PATH
  EOF