svn commit: r1796435 - /spamassassin/trunk/backend/nitemc/extract_to_rsync_dir

[da...@apache.org]

Author: davej
Date: Sat May 27 18:15:44 2017
New Revision: 1796435

URL: http://svn.apache.org/viewvc?rev=1796435&view=rev
Log:
Fixed pathing for new server.

Modified:
    spamassassin/trunk/backend/nitemc/extract_to_rsync_dir

Modified: spamassassin/trunk/backend/nitemc/extract_to_rsync_dir
URL: http://svn.apache.org/viewvc/spamassassin/trunk/backend/nitemc/extract_to_rsync_dir?rev=1796435&r1=1796434&r2=1796435&view=diff
==============================================================================
--- spamassassin/trunk/backend/nitemc/extract_to_rsync_dir (original)
+++ spamassassin/trunk/backend/nitemc/extract_to_rsync_dir Sat May 27 18:15:44 2017
@@ -1,14 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # Cron script for "release".  See "backend/nitemc/crontab.txt"
 
-RSYNC_DIR=/home/corpus-rsync/tagged_builds
-REPO_URL=http://svn.apache.org/repos/asf/spamassassin/trunk
-#switched to system perl for spamassassin-vm and system svn
+RSYNC_DIR="/usr/local/spamassassin/rsync/tagged_builds"
+REPO_URL="http://svn.apache.org/repos/asf/spamassassin/trunk"
 PERL=/usr/bin/perl
 SVN=/usr/bin/svn
-#PERL=/local/perl586/bin/perl
-#SVN=/opt/subversion-current/bin/svn
 
 
 type="$1"
@@ -26,21 +23,6 @@ fi
 
 subdir=${type}_mass_check
 
-# No Idea why this command is here even AFTER reading the docs...
-# bash man for set
-#
-# Without options, the name and value of each shell variable are displayed in a format that can be reused as input for setting or resetting the currently-set variables.  Read-only variables  cannot  be
-#              reset.   In posix mode, only shell variables are listed.  The output is sorted according to the current locale.  When options are specified, they set or unset shell attributes.  Any arguments remain-
-#              ing after option processing are treated as values for the positional parameters and are assigned, in order, to $1, $2, ...  $n.  Options, if specified, have the following meanings:
-#              -e      Exit immediately if a pipeline (which may consist of a single simple command),  a subshell command enclosed in parentheses, or one of the commands executed as part of a command list  enclosed
-#                      by  braces  (see  SHELL GRAMMAR above) exits with a non-zero status.  The shell does not exit if the command that fails is part of the command list immediately following a while or until key-
-#                      word, part of the test following the if or elif reserved words, part of any command executed in a && or ││ list except the command following the final && or ││, any command in a pipeline  but
-#                      the  last,  or  if the command’s return value is being inverted with !.  A trap on ERR, if set, is executed before the shell exits.  This option applies to the shell environment and each sub-
-#                      shell environment separately (see COMMAND EXECUTION ENVIRONMENT above), and may cause subshells to exit before executing all the commands in the subshell.
-#              -x      After expanding each simple command, for command, case command, select command, or arithmetic for command, display the expanded value of PS4, followed by the command and  its  expanded  argu-
-#                      ments or associated word list.
-set -ex
-
 echo "Type: $type"
 echo "Version File: $versfile"
 echo "Subdir: $subdir"
@@ -49,12 +31,12 @@ REV=`tail -1 $versfile | awk '{print $2}
 
 echo "Revision: $REV"
 
+set -ex
+
 for retry in 1 2 3 4 5 6 7 8 9 10 ; do
 
     # export the main repo:
     rm -rf $RSYNC_DIR/$subdir
-    echo Command: $SVN export --non-interactive \
-            -r $REV $REPO_URL $RSYNC_DIR/$subdir
     $SVN export --non-interactive -r $REV $REPO_URL $RSYNC_DIR/$subdir \
             || continue