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

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

Update of /cvsroot/env-switcher/env-switcher/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21771/dist

Modified Files:
	buildrpm.sh 
Log Message:
Remove redundant code


Index: buildrpm.sh
===================================================================
RCS file: /cvsroot/env-switcher/env-switcher/dist/buildrpm.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** buildrpm.sh	16 Jan 2004 15:54:27 -0000	1.5
--- buildrpm.sh	8 Mar 2004 23:40:27 -0000	1.6
***************
*** 112,157 ****
  
  #
- # 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 "------------------------------------------------------------"
-     sudo -u root sh -c "$0 $tarball"
-     echo "------------------------------------------------------------"
-     echo "--> sudo finished"
-     exit 0
- fi
- 
- #
  # make sure we have write access to the directories we need
  #
--- 112,115 ----