make it work on lxplus

diff --git a/PWGPP/QA/scripts/alienSync.conf b/PWGPP/QA/scripts/alienSync.conf
index e252458917a52b99995357b6e053ff91d96072e0..ce0b3fc6e275b731ad5ef45594b4b7f2570e359f 100644 (file)
--- a/PWGPP/QA/scripts/alienSync.conf
+++ b/PWGPP/QA/scripts/alienSync.conf
@@ -14,7 +14,6 @@ localPathPrefix="/hera/alice/alien"
 logOutputPath="/hera/alice/aux/logs/alienSync/alienSync.2012.CalibObjects.root.logs"
 
 alienUserName="mkrzewic"
-alienInitScript="/hera/alice/aux/scripts/cron_scripts/alienSync/setALIEN_ROOT.sh"
 
 # set to 1 for a cron job - all stdout and stderr redirected to a log file
 allOutputToLog=1
@@ -36,7 +35,7 @@ unzipFiles=0
 secondsToSuicide=$(( 10*3600 ))
 
 #all files will be in the specified group:
-alienSyncFilesGroupOwnership="alidata"
+#alienSyncFilesGroupOwnership="z2"
 
 #execute in the destination directory after the file has been downloaded
 #one can use the internal variable ${destination} to access the file

diff --git a/PWGPP/QA/scripts/alienSync.sh b/PWGPP/QA/scripts/alienSync.sh
index 0dd00051221fe30ce6fe6d7f541bf8e86d4b63a3..3efccd2eae31e4de7acb9a983f9db0ac419b36ae 100644 (file)
--- a/PWGPP/QA/scripts/alienSync.sh
+++ b/PWGPP/QA/scripts/alienSync.sh
@@ -19,6 +19,9 @@ main()
   # try to load the config file
   [[ ! -f $1 ]] && echo "config file $1 not found, exiting..." | tee -a $logFile && exit 1
   source $1
+  
+  #if not set, use the default group
+  [[ -z ${alienSyncFilesGroupOwnership} ]] && alienSyncFilesGroupOwnership=$(id -gn)
 
   # do some accounting
   [[ ! -d $logOutputPath ]] && echo "logOutputPath not available, creating..." && sg ${alienSyncFilesGroupOwnership} "mkdir -p $logOutputPath"
@@ -59,8 +62,6 @@ main()
   [[ -z $secondsToSuicide ]] && echo "setting default secondsToSuicide of 10 hrs..." && secondsToSuicide=$(( 10*3600 ))
 
   # init alien 
-  echo source $alienInitScript
-  source $alienInitScript ""
   [[ -z $ALIEN_ROOT && -n $ALIEN_DIR ]] && ALIEN_ROOT=$ALIEN_DIR
   #if ! haveAlienToken; then
   #  $ALIEN_ROOT/api/bin/alien-token-destroy
@@ -75,7 +76,7 @@ main()
   #fi
   #ls -ltr /tmp/gclient_env_$UID
   #cat /tmp/gclient_env_$UID
-  #source /tmp/gclient_env_$UID
+  source /tmp/gclient_env_$UID
 
   #set a default timeout for grid access
   [[ -z $copyTimeout ]] && copyTimeout=600
@@ -230,7 +231,7 @@ main()
         echo "OK md5 after download"
         downloadOK=1
       else
-        echo "tried to parse this: $md5alien  $tmpdestination"
+        echo "failed verifying md5 $md5alien of $tmpdestination"
       fi
     else
       downloadOK=1
@@ -263,6 +264,7 @@ main()
       [[ -n ${postCommand} ]] && ( cd ${destinationdir}; eval "${postCommand}" )
     else
       echo "download not validated, NOT moving to ${destination}..."
+      echo "removing $tmpdestination"
       rm -f $tmpdestination
       continue
     fi
@@ -445,23 +447,20 @@ haveAlienToken()
 copyFromAlien()
 {
   #copy the file $1 to $2 using a specified method
-  #uses the "timelimit" command to make sure the 
+  #uses the "timeout" command to make sure the 
   #download processes will not hang forever.
   #
-  #("timelimit" prints a default message if it kills the command, 
-  #"timeout" does not, but may be more compatible with more 
-  #systems as it is a part of coreutils)
   [[ -z $copyTimeout ]] && copyTimeout=600
   [[ -z $copyTimeoutHard ]] && copyTimeoutHard=1200
   src=${1//"alien://"/}
   src="alien://${src}"
   dst=$2
   if [[ "$copyMethod" == "tfilecp" ]]; then
-    echo timelimit -t $copyTimeout -T $copyTimeoutHard root -b -q "$copyScript(\"$src\",\"$dst\")"
-    timelimit -t $copyTimeout -T $copyTimeoutHard root -b -q "$copyScript(\"$src\",\"$dst\")"
+    echo timeout $copyTimeout root -b -q "$copyScript(\"$src\",\"$dst\")"
+    timeout $copyTimeout root -b -q "$copyScript(\"$src\",\"$dst\")"
   else
-    echo timelimit -t $copyTimeout -T $copyTimeoutHard $ALIEN_ROOT/api/bin/alien_cp $src $dst
-    timelimit -t $copyTimeout -T $copyTimeoutHard $ALIEN_ROOT/api/bin/alien_cp $src $dst
+    echo timeout $copyTimeout $ALIEN_ROOT/api/bin/alien_cp $src $dst
+    timeout $copyTimeout $ALIEN_ROOT/api/bin/alien_cp $src $dst
   fi
 }