Changes to gnats/send-pr/send-pr.sh

Milan Zamazal <[email protected]> Mon, 20 May 2002 08:25:10 -0400
Newsgroups gmane.comp.bug-tracking.gnats.patches
Message-ID <[email protected]>
Index: gnats/send-pr/send-pr.sh
diff -c gnats/send-pr/send-pr.sh:1.19 gnats/send-pr/send-pr.sh:1.20
*** gnats/send-pr/send-pr.sh:1.19	Sun May 19 16:31:20 2002
--- gnats/send-pr/send-pr.sh	Mon May 20 08:25:10 2002
***************
*** 168,185 ****
    ORGANIZATION="$DEFAULT_ORGANIZATION";
  fi
  
! if [ -n "$ORGANIZATION" -a "x$ORGANIZATION" != "xunknown" ]; then
!   if [ -f "$ORGANIZATION" ]; then
      ORGANIZATION="`cat $ORGANIZATION`"
    fi
!   if [ -n "$ORGANIZATION" ]; then
!     ORGANIZATION="$ORGANIZATION"
!   elif [ -f $HOME/.organization ]; then
!     ORGANIZATION="`cat $HOME/.organization`"
!   fi
  fi
  
! if [ "x$ORGANIZATION" = "xunknown" ]; then
    cat <<__EOF__
  It seems that send-pr is not installed with your organization set to a useful
  value.  To fix this, you need to edit the configuration file
--- 168,182 ----
    ORGANIZATION="$DEFAULT_ORGANIZATION";
  fi
  
! if [ -n "$ORGANIZATION" -a "x$ORGANIZATION" != "xDEFAULT_ORGANIZATIONx" ]; then
!   if [ `echo $ORGANIZATION | fgrep -c /` -gt 0 -a -f "$ORGANIZATION" ]; then
      ORGANIZATION="`cat $ORGANIZATION`"
    fi
! elif [ -f $HOME/.organization ]; then
!   ORGANIZATION="`cat $HOME/.organization`"
  fi
  
! if [ "x$ORGANIZATION" = "xDEFAULT_ORGANIZATIONx" ]; then
    cat <<__EOF__
  It seems that send-pr is not installed with your organization set to a useful
  value.  To fix this, you need to edit the configuration file
***************
*** 188,193 ****
--- 185,192 ----
  
  __EOF__
    ORGANIZATION="";
+ else
+   DEFAULT_ORGANIZATION="$ORGANIZATION"
  fi 1>&2
  
  # If they don't have a preferred editor set, then use