package/rpm, src/main/bash: refactor Bash scripts

package/rpm/build-rpm.sh

@@ -1,18 +1,18 @@
-#!/bin/bash
-set -ex
+#!/usr/bin/env bash
+set -exu -o pipefail
 name=voms-clients
 
 base_dir=../../
 source_dir=sources
 rpmbuild_dir=$(pwd)/rpmbuild
 
 # spec file and its source
-spec_src=${name}.spec.in
-spec=${name}3.spec
+spec_src="${name}.spec.in"
+spec="${name}3.spec"
 
 # determine the pom version and the rpm version
-pom_version=$(grep "<version>" ${base_dir}/pom.xml | head -1 | sed -e 's/<version>//g' -e 's/<\/version>//g' -e "s/[ \t]*//g")
-rpm_version=$(grep "Version:" ${spec_src} | sed -e "s/Version://g" -e "s/[ \t]*//g")
+pom_version=$(grep "<version>" "${base_dir}/pom.xml" | head -1 | sed -e 's/<version>//g' -e 's/<\/version>//g' -e "s/[ \t]*//g")
+rpm_version=$(grep "Version:" "${spec_src}" | sed -e "s/Version://g" -e "s/[ \t]*//g")
 
 # Cleanup
 ./clean.sh
@@ -21,28 +21,28 @@ rpm_version=$(grep "Version:" ${spec_src} | sed -e "s/Version://g" -e "s/[ \t]*/
 sed -e "s#@@POM_VERSION@@#$pom_version#g" ${spec_src} > ${spec}
 
 ## setup RPM build dir structure
-mkdir -p ${rpmbuild_dir}/BUILD \
-	  ${rpmbuild_dir}/RPMS \
-	  ${rpmbuild_dir}/SOURCES \
-	  ${rpmbuild_dir}/SPECS \
-	  ${rpmbuild_dir}/SRPMS
+mkdir -p "${rpmbuild_dir}/BUILD" \
+	  "${rpmbuild_dir}/RPMS" \
+	  "${rpmbuild_dir}/SOURCES" \
+	  "${rpmbuild_dir}/SPECS" \
+	  "${rpmbuild_dir}/SRPMS"
 
 ## Prepare sources
 ## We cannot use tar --transform as the tar version in SL5 does not support it
-source_tmp_dir=$(mktemp -d /tmp/voms-client-rpm.XXXXX)
+source_tmp_dir="$(mktemp -d /tmp/voms-client-rpm.XXXXX)"
 
-mkdir -p ${source_tmp_dir}/${name}
-cp -r ${base_dir} ${source_tmp_dir}/${name}
-pushd ${source_tmp_dir}
-tar cvzf ${rpmbuild_dir}/SOURCES/${name}3-${rpm_version}.tar.gz --exclude="${name}/package/*" --exclude="${name}/package" --exclude="${name}/target" .
+mkdir -p "${source_tmp_dir}/${name}"
+cp -r "${base_dir}" "${source_tmp_dir}/${name}"
+pushd "${source_tmp_dir}"
+tar cvzf "${rpmbuild_dir}/SOURCES/${name}3-${rpm_version}.tar.gz" --exclude="${name}/package/*" --exclude="${name}/package" --exclude="${name}/target" .
 popd
 
-rm -rf ${soruce_tmp_dir}
+rm -rf "${source_tmp_dir}"
 
 ## Build RPMs
 if [ -z "${dist}" ]; then
-	rpmbuild --nodeps -v -ba ${spec} --define "_topdir ${rpmbuild_dir}"
+	rpmbuild --nodeps -v -ba "${spec}" --define "_topdir ${rpmbuild_dir}"
 else
-	rpmbuild --nodeps -v -ba ${spec} --define "_topdir ${rpmbuild_dir}" --define "dist ${dist}"
+	rpmbuild --nodeps -v -ba "${spec}" --define "_topdir ${rpmbuild_dir}" --define "dist ${dist}"
 fi
 

package/rpm/clean.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 rm -rf rpmbuild
 rm -f *.spec

src/main/bash/voms-proxy-destroy.sh

@@ -1,36 +1,29 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #set -x
+set -eu -o pipefail
 
-VOMSCLIENTS_LIBS=${voms-clients.libs}
+VOMSCLIENTS_LIBS="${voms-clients.libs-}"
 
-if [ "x$VOMSCLIENTS_LIBS" == "x" ]; then
+if [ -z "$VOMSCLIENTS_LIBS" ]; then
 
-  PRG="$0"
-  while [ -h "$PRG" ]; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG=`dirname "$PRG"`/"$link"
-    fi
-  done
+  PRG="$(realpath "$0")"
 
-  PRGDIR=`dirname "$PRG"`
+  PRGDIR="$(dirname "$PRG")"
 
-  VOMSCLIENTS_HOME=`cd "$PRGDIR/.." ; pwd`
+  VOMSCLIENTS_HOME="$(cd "$PRGDIR/.." ; pwd)"
 
-  VOMSCLIENTS_LIBS=$VOMSCLIENTS_HOME/share/java/voms-clients
+  VOMSCLIENTS_LIBS="$VOMSCLIENTS_HOME/share/java/voms-clients"
 
 fi
 
 # ':' separated list of jars, for the classpath
-VOMSCLIENTS_CP=`ls -1 $VOMSCLIENTS_LIBS/*.jar | tr '\n' ':'`
+VOMSCLIENTS_CP="$(find "$VOMSCLIENTS_LIBS" -name "*.jar" -printf '%p:')"
 
 # the class implementing voms-proxy-destroy
 VOMSPROXYDESTROY_CLASS="org.italiangrid.voms.clients.VomsProxyDestroy"
 
 # JVM options
-VOMS_CLIENTS_JAVA_OPTIONS=${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m -Djava.net.preferIPv6Addresses=true"}
+VOMS_CLIENTS_JAVA_OPTIONS="${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m -Djava.net.preferIPv6Addresses=true"}"
 
-java $VOMS_CLIENTS_JAVA_OPTIONS -cp $VOMSCLIENTS_CP $VOMSPROXYDESTROY_CLASS "$@"
+# shellcheck disable=SC2086 # VOMS_CLIENTS_JAVA_OPTIONS is meant to be expanded space-delimited
+java $VOMS_CLIENTS_JAVA_OPTIONS -cp "$VOMSCLIENTS_CP" "$VOMSPROXYDESTROY_CLASS" "$@"

src/main/bash/voms-proxy-info.sh

@@ -1,35 +1,29 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #set -x
+set -eu -o pipefail
 
-VOMSCLIENTS_LIBS=${voms-clients.libs}
+VOMSCLIENTS_LIBS="${voms-clients.libs-}"
 
-if [ "x$VOMSCLIENTS_LIBS" == "x" ]; then
+if [ -z "$VOMSCLIENTS_LIBS" ]; then
 
-  PRG="$0"
-  while [ -h "$PRG" ]; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG=`dirname "$PRG"`/"$link"
-    fi
-  done
+  PRG="$(realpath "$0")"
 
-  PRGDIR=`dirname "$PRG"`
+  PRGDIR="$(dirname "$PRG")"
 
-  VOMSCLIENTS_HOME=`cd "$PRGDIR/.." ; pwd`
+  VOMSCLIENTS_HOME="$(cd "$PRGDIR/.." ; pwd)"
+
+  VOMSCLIENTS_LIBS="$VOMSCLIENTS_HOME/share/java/voms-clients"
 
-  VOMSCLIENTS_LIBS=$VOMSCLIENTS_HOME/share/java/voms-clients
 fi
 
 # ':' separated list of jars, for the classpath
-VOMSCLIENTS_CP=`ls -1 $VOMSCLIENTS_LIBS/*.jar | tr '\n' ':'`
+VOMSCLIENTS_CP="$(find "$VOMSCLIENTS_LIBS" -name "*.jar" -printf '%p:')"
 
 # the class implementing voms-proxy-info
 VOMSPROXYINFO_CLASS="org.italiangrid.voms.clients.VomsProxyInfo"
 
 # JVM options
-VOMS_CLIENTS_JAVA_OPTIONS=${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m -Djava.net.preferIPv6Addresses=true"}
+VOMS_CLIENTS_JAVA_OPTIONS="${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m -Djava.net.preferIPv6Addresses=true"}"
 
-java $VOMS_CLIENTS_JAVA_OPTIONS -cp $VOMSCLIENTS_CP $VOMSPROXYINFO_CLASS "$@"
+# shellcheck disable=SC2086 # VOMS_CLIENTS_JAVA_OPTIONS is meant to be expanded space-delimited
+java $VOMS_CLIENTS_JAVA_OPTIONS -cp "$VOMSCLIENTS_CP" "$VOMSPROXYINFO_CLASS" "$@"

src/main/bash/voms-proxy-init.sh

@@ -1,35 +1,28 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #set -x
+set -eu -o pipefail
 
-VOMSCLIENTS_LIBS=${voms-clients.libs}
+VOMSCLIENTS_LIBS="${voms-clients.libs-}"
 
-if [ "x$VOMSCLIENTS_LIBS" == "x" ]; then
+if [ -z "$VOMSCLIENTS_LIBS" ]; then
 
-  PRG="$0"
-  while [ -h "$PRG" ]; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG=`dirname "$PRG"`/"$link"
-    fi
-  done
+  PRG="$(realpath "$0")"
 
-  PRGDIR=`dirname "$PRG"`
+  PRGDIR="$(dirname "$PRG")"
 
-  VOMSCLIENTS_HOME=`cd "$PRGDIR/.." ; pwd`
+  VOMSCLIENTS_HOME="$(cd "$PRGDIR/.." ; pwd)"
 
-  VOMSCLIENTS_LIBS=$VOMSCLIENTS_HOME/share/java/voms-clients
+  VOMSCLIENTS_LIBS="$VOMSCLIENTS_HOME/share/java/voms-clients"
 fi
 
 # ':' separated list of jars, for the classpath
-VOMSCLIENTS_CP=`ls -1 $VOMSCLIENTS_LIBS/*.jar | tr '\n' ':'`
+VOMSCLIENTS_CP="$(find "$VOMSCLIENTS_LIBS" -name "*.jar" -printf '%p:')"
 
 # the class implementing voms-proxy-init
 VOMSPROXYINIT_CLASS="org.italiangrid.voms.clients.VomsProxyInit"
 
 # JVM options
-VOMS_CLIENTS_JAVA_OPTIONS=${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m -Djava.net.preferIPv6Addresses=true"}
+VOMS_CLIENTS_JAVA_OPTIONS="${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m -Djava.net.preferIPv6Addresses=true"}"
 
-java $VOMS_CLIENTS_JAVA_OPTIONS -cp $VOMSCLIENTS_CP $VOMSPROXYINIT_CLASS "$@"
+# shellcheck disable=SC2086 # VOMS_CLIENTS_JAVA_OPTIONS is meant to be expanded space-delimited
+java $VOMS_CLIENTS_JAVA_OPTIONS -cp "$VOMSCLIENTS_CP" "$VOMSPROXYINIT_CLASS" "$@"