Merge pull request #9261 from belforte/patch-2

bump crab client version in crab-dev
cms-sw · Jun 24, 2024 · abdf4f6 · abdf4f6
2 parents 137dbb7 + e272949
commit abdf4f6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/crab-build.file b/crab-build.file
@@ -43,11 +43,14 @@ for pkg in %{crabserver_packages} ; do
   fi
 done
 
-if [ $(grep '_UseCrab' %{i}/etc/crab-bash-completion.sh | wc -l) -gt 0 ] && [ $(grep ' filenames  *crab' %{i}/etc/crab-bash-completion.sh |wc -l) -gt 0 ] ; then
-  sed -i -e 's|_UseCrab|_UseCrab_%{crab_type}|g;s| filenames  *crab| filenames crab-%{crab_type}|' %{i}/etc/crab-bash-completion.sh
-  if [ "%{crab_type}" = "prod" ] ; then
-    echo "complete -F _UseCrab_prod -o filenames crab" >> %{i}/etc/crab-bash-completion.sh
+#complete command in crab-bash-completion.sh should match '^\s*complete\s+-F\s+.*\s_UseCrab\s.*\scrab\s*$'
+COMPLETE_CMD=$(grep '^\s*complete\s\s*-F\s' %{i}/etc/crab-bash-completion.sh | grep '\s_UseCrab\s' | grep '\scrab\s*$')
+if [ "${COMPLETE_CMD}" != "" ] ; then
+  sed -i -e 's|^\s*complete\s\s*-F\s.*$|@COMPLETE_CMD@|' %{i}/etc/crab-bash-completion.sh
+  if [ "%{crab_type}" != "prod" ] ; then
+    COMPLETE_CMD=$(echo "${COMPLETE_CMD}" | sed 's/\scrab\s*$/ crab-%{crab_type}/')
   fi
+  sed -i -e "s/@COMPLETE_CMD@/${COMPLETE_CMD}/;s|_UseCrab|_UseCrab_%{crab_type}|" %{i}/etc/crab-bash-completion.sh
 else
   echo "ERROR: Unable to fix crab use function _UseCrab"
   exit 1

diff --git a/crab-dev.spec b/crab-dev.spec
@@ -3,8 +3,8 @@
 #For any other change, increment version_suffix
 ##########################################
 %define version_suffix 00
-%define crabclient_version v3.240520
+%define crabclient_version v3.240621
 ### RPM cms crab-dev %{crabclient_version}.%{version_suffix}
-%define crabserver_version v3.240517
+%define crabserver_version v3.240527
 
 ## IMPORT crab-build
diff --git a/crab-pre.spec b/crab-pre.spec
@@ -2,7 +2,7 @@
 #For new crabclient_version, set the version_suffix to 00
 #For any other change, increment version_suffix
 ##########################################
-%define version_suffix 00
+%define version_suffix 01
 %define crabclient_version v3.240416
 ### RPM cms crab-pre %{crabclient_version}.%{version_suffix}
 %define crabserver_version v3.240325

diff --git a/crab-prod.spec b/crab-prod.spec
@@ -2,7 +2,7 @@
 #For new crabclient_version, set the version_suffix to 00
 #For any other change, increment version_suffix
 ##########################################
-%define version_suffix 00
+%define version_suffix 01
 %define crabclient_version v3.240520
 ### RPM cms crab-prod %{crabclient_version}.%{version_suffix}
 %define crabserver_version v3.240517