[env-switcher-cvs] CVS: env-switcher/dist buildrpm.sh,1.4,1.5

[Jeff S. <jsq...@us...>]

Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1:/tmp/cvs-serv32686

Modified Files:
	buildrpm.sh 
Log Message:
Updates to make the script mo' better


Index: buildrpm.sh
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/buildrpm.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** buildrpm.sh	11 Oct 2002 17:00:44 -0000	1.4
--- buildrpm.sh	16 Jan 2004 15:54:27 -0000	1.5
***************
*** 73,79 ****
  #
  
! if test -d /usr/src/RPM; then
      rpmtopdir="/usr/src/RPM"
  else
      rpmtopdir="/usr/src/redhat"
  fi
--- 73,97 ----
  #
  
! rpmtopdir="`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"
! if test "$rpmtopdir" != ""; then
!     if test ! -d "$rpmtopdir"; then
! 	mkdir -p "$rpmtopdir"
! 	mkdir -p "$rpmtopdir/BUILD"
! 	mkdir -p "$rpmtopdir/RPMS"
! 	mkdir -p "$rpmtopdir/RPMS/i386"
! 	mkdir -p "$rpmtopdir/RPMS/i586"
! 	mkdir -p "$rpmtopdir/RPMS/i686"
! 	mkdir -p "$rpmtopdir/RPMS/noarch"
! 	mkdir -p "$rpmtopdir/RPMS/athlon"
! 	mkdir -p "$rpmtopdir/SOURCES"
! 	mkdir -p "$rpmtopdir/SPECS"
! 	mkdir -p "$rpmtopdir/SRPMS"
!     fi
!     need_root=0
! elif test -d /usr/src/RPM; then
!     need_root=1
      rpmtopdir="/usr/src/RPM"
  else
+     need_root=1
      rpmtopdir="/usr/src/redhat"
  fi
***************
*** 84,88 ****
  #
  
! if test "`whoami`" != "root"; then
      echo "--> Trying to sudo: \"$0 $*\""
      echo "------------------------------------------------------------"
--- 102,148 ----
  #
  
! if test "$need_root" = "1" -a "`whoami`" != "root"; then
!     echo "--> Trying to sudo: \"$0 $*\""
!     echo "------------------------------------------------------------"
!     sudo -u root sh -c "$0 $tarball"
!     echo "------------------------------------------------------------"
!     echo "--> sudo finished"
!     exit 0
! fi
! 
! #
! # Find where the top RPM-building directory is
! #
! 
! rpmtopdir="`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"
! if test "$rpmtopdir" != ""; then
!     if test ! -d "$rpmtopdir"; then
! 	mkdir -p "$rpmtopdir"
! 	mkdir -p "$rpmtopdir/BUILD"
! 	mkdir -p "$rpmtopdir/RPMS"
! 	mkdir -p "$rpmtopdir/RPMS/i386"
! 	mkdir -p "$rpmtopdir/RPMS/i586"
! 	mkdir -p "$rpmtopdir/RPMS/i686"
! 	mkdir -p "$rpmtopdir/RPMS/noarch"
! 	mkdir -p "$rpmtopdir/RPMS/athlon"
! 	mkdir -p "$rpmtopdir/SOURCES"
! 	mkdir -p "$rpmtopdir/SPECS"
! 	mkdir -p "$rpmtopdir/SRPMS"
!     fi
!     need_root=0
! elif test -d /usr/src/RPM; then
!     need_root=1
!     rpmtopdir="/usr/src/RPM"
! else
!     need_root=1
!     rpmtopdir="/usr/src/redhat"
! fi
! echo "--> Found RPM top dir: $rpmtopdir"
! 
! #
! # If we're not root, try to sudo
! #
! 
! if test "$need_root" = "1" -a "`whoami`" != "root"; then
      echo "--> Trying to sudo: \"$0 $*\""
      echo "------------------------------------------------------------"
***************
*** 158,179 ****
  
  echo "--> Building the OSCAR RPM"
! cmd="rpm -ba --target=$oscar_target $specdest"
  echo "--> $cmd"
  eval $cmd
  
- # This is a total hack and is only here because RPM changed option
- # formats between RH 7.1 and 7.2.  <sigh>
- 
- if test $? != 0; then
-   echo "--> TRY AGAIN: without the =..."
-   new_cmd="`echo $cmd | sed -e 's/=/ /'`"
-   echo "--> $new_cmd"
-   eval $new_cmd
- fi
- if test $? != 0; then
-   echo "*** FAILURE BUILDING OSCAR RPM!"
-   echo "Aborting"
-   exit 1
- fi
  echo "--> Done building the OSCAR RPM"
  
--- 218,225 ----
  
  echo "--> Building the OSCAR RPM"
! cmd="rpmbuild -ba --target=$oscar_target $specdest"
  echo "--> $cmd"
  eval $cmd
  
  echo "--> Done building the OSCAR RPM"