allow relocation of srmclient scripts

many of the srm scripts point to the generic srm script in
/usr/sbin/srm without using considering $SRM_PATH. This causes
problems if the scripts are installed in different locations than the
ones defined in the RPM.

This patch changes the default location of the generic srm script from
/usr/sbin/srm to ${SRM_PATH}/sbin which is /usr/share/srm/sbin by
default and changes all other scripts to use "${SRM_PATH}/sbin/srm",
thus allowing relocation of the scripts.

Ticket: http://rt.dcache.org/Ticket/Display.html?id=7989
Acked-by:
Target: trunk
Require-book: no
Require-notes: yes

Author: Karsten Schwank

modules/srmclient/src/main/assembly/dir.xml

@@ -26,16 +26,9 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/src/main/sbin</directory>
-            <outputDirectory>usr/sbin</outputDirectory>
+            <directory>${project.basedir}/src/main/lib</directory>
+            <outputDirectory>usr/share/srm/lib</outputDirectory>
             <fileMode>775</fileMode>
-            <excludes>
-                <exclude>make_release.sh</exclude>
-                <exclude>sdn</exclude>
-                <exclude>make-srmcp-rpm</exclude>
-                <exclude>timeout.sh</exclude>
-                <exclude>f-srmcp-prepare-and-make-in-user-space</exclude>
-            </excludes>
         </fileSet>
         <fileSet>
             <directory>${project.basedir}/src/main/conf</directory>

modules/srmclient/src/main/bin/adler32

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -32,7 +32,7 @@ OPTIONS="-Djava.protocol.handler.pkgs=org.globus.net.protocol"
 
 if [ "$SECURITY_DEBUG" = "true" ]
 then
-  OPTIONS=" ${OPTIONS} -Dlogback.configurationFile=/usr/share/srm/conf/logback-all.xml"
+  OPTIONS=" ${OPTIONS} -Dlogback.configurationFile=${SRM_PATH}/conf/logback-all.xml"
 fi
 
 cmd="java -cp $SRM_CP $OPTIONS org.dcache.srm.util.Adler32  $*"

modules/srmclient/src/main/bin/srm-abort-files

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -11,4 +11,4 @@ fi
 
 export SRM_PATH
 
-/usr/sbin/srm -abortFiles $*
+"${SRM_PATH}/lib/srm" -abortFiles $*

modules/srmclient/src/main/bin/srm-abort-request

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -11,4 +11,4 @@ fi
 
 export SRM_PATH
 
-/usr/sbin/srm -abortRequest $*
+"${SRM_PATH}/lib/srm" -abortRequest $*

modules/srmclient/src/main/bin/srm-advisory-delete

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -11,4 +11,4 @@ fi
 
 export SRM_PATH
 
-/usr/sbin/srm -advisoryDelete $*
+"${SRM_PATH}/lib/srm" -advisoryDelete $*

modules/srmclient/src/main/bin/srm-bring-online

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -11,4 +11,4 @@ fi
 
 export SRM_PATH
 
-/usr/sbin/srm -bringOnline $*
+"${SRM_PATH}/lib/srm" -bringOnline $*

modules/srmclient/src/main/bin/srm-check-permissions

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -11,4 +11,4 @@ fi
 
 export SRM_PATH
 
-/usr/sbin/srm -checkPermissions $*
+"${SRM_PATH}/lib/srm" -checkPermissions $*

modules/srmclient/src/main/bin/srm-extend-file-lifetime

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -11,4 +11,4 @@ fi
 
 export SRM_PATH
 
-/usr/sbin/srm -extendFileLifetime $*
+"${SRM_PATH}/lib/srm" -extendFileLifetime $*

modules/srmclient/src/main/bin/srm-get-metadata

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -11,4 +11,4 @@ fi
 
 export SRM_PATH
 
-/usr/sbin/srm -getFileMetaData $*
+"${SRM_PATH}/lib/srm" -getFileMetaData $*

modules/srmclient/src/main/bin/srm-get-permissions

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -z "$SRM_PATH" ]; then
-    SRM_PATH="/usr/share/srm"
+    SRM_PATH="$(cd $(dirname $0)/../share/srm;pwd)"
 fi
 
 if [ ! -d "$SRM_PATH" ]; then
@@ -11,4 +11,4 @@ fi
 
 export SRM_PATH
 
-/usr/sbin/srm -getPermissions $*
+"${SRM_PATH}/lib/srm" -getPermissions $*