Index: build
===================================================================
RCS file: /scotty/triggers/redhat/build,v
retrieving revision 1.6.4.18.2.14
diff -c -r1.6.4.18.2.14 build
*** build	14 Apr 2020 11:58:42 -0000	1.6.4.18.2.14
--- build	15 Apr 2020 01:22:32 -0000
***************
*** 90,96 ****
  echo "untar cvs-suite-triggers RPM"
  tar xzf ./triggers-$VERSION.tar.gz
  
! 
  sudo rpm --nodeps -e  cvs-suite-triggers; sudo rpm --nodeps -e cvsnt
  if [ -x /usr/bin/cvsnt ]; then
    sudo rpm -e cvsnt
--- 90,96 ----
  echo "untar cvs-suite-triggers RPM"
  tar xzf ./triggers-$VERSION.tar.gz
  
! echo "uninstall cvs-suite-triggers and cvsnt (may cause error if not installed)"
  sudo rpm --nodeps -e  cvs-suite-triggers; sudo rpm --nodeps -e cvsnt
  if [ -x /usr/bin/cvsnt ]; then
    sudo rpm -e cvsnt
***************
*** 100,105 ****
--- 100,106 ----
      exit
    fi
  fi
+ echo "uninstalled cvs-suite-triggers and cvsnt"
  #read
  
  rm -rf triggers.spec.tmp
***************
*** 142,148 ****
--- 143,151 ----
  if [ ! -f triggers.spec ]; then echo "cannot create new local spec"; exit 1; fi
  
  if [ "x$MAJOR" != "x2.8" -o "x$1" == "xfull" -o "x$1" == "xlicense.full" ]; then
+   echo "scp $MYHOST:cvs/cvsnt-$VERSION-$REDHATDIST-rpm.tar.gz ."
    scp $MYHOST:cvs/cvsnt-$VERSION-$REDHATDIST-rpm.tar.gz .
+   if [ ! -f ./cvsnt-$VERSION-$REDHATDIST-rpm.tar.gz ]; then echo "cannot download cvsnt"; exit 1; fi
    tar xzf ./cvsnt-$VERSION-$REDHATDIST-rpm.tar.gz
  else
    scp $MYHOST:cvs/cvsnt-trial-$VERSION-$REDHATDIST-rpm.tar.gz .
***************
*** 150,156 ****
  fi
  
  
! sudo rpm -Uvf --nodeps cvsnt-$VERSION-1.i386.rpm
  if [ ! -x /usr/bin/cvsnt ]; then
    echo "CVSNT cannot be installed - cannot continue"
    read
--- 153,162 ----
  fi
  
  
! if [ ! -f ./cvsnt-$VERSION-1.$RPMBUILDARCH.rpm ]; then echo "downloaded cvsnt tar file does not contain rpm"; exit 1; fi
! echo "install cvsnt"
! echo "sudo rpm -Uvf --nodeps cvsnt-$VERSION-1.$RPMBUILDARCH.rpm"
! sudo rpm -Uvf --nodeps cvsnt-$VERSION-1.$RPMBUILDARCH.rpm
  if [ ! -x /usr/bin/cvsnt ]; then
    echo "CVSNT cannot be installed - cannot continue"
    read
***************
*** 169,175 ****
    read
    exit
  fi
! echo "Reported Version is $RVERSION"
  if [ "x$MAJOR" == "x2.8" ]; then
    LICENSE=`cvsmanager -l`
    if [ "x$LICENSE" == "x" ]; then
--- 175,181 ----
    read
    exit
  fi
! echo "installed cvsnt - reported Version is $RVERSION"
  if [ "x$MAJOR" == "x2.8" ]; then
    LICENSE=`cvsmanager -l`
    if [ "x$LICENSE" == "x" ]; then