Merge pull request #168 from brianhlin/v2

POSIX compat + bump version to 2.2.3

Author: brianhlin

config/htcondor-ce.spec

@@ -2,7 +2,7 @@
 #define gitrev osg
 
 Name: htcondor-ce
-Version: 2.2.2
+Version: 2.2.3
 Release: 1%{?gitrev:.%{gitrev}git}%{?dist}
 Summary: A framework to run HTCondor as a CE
 BuildArch: noarch
@@ -497,6 +497,10 @@ fi
 %attr(1777,root,root) %dir %{_localstatedir}/lib/gratia/condorce_data
 
 %changelog
+* Mon Aug 28 2017 Brian Lin <blin@cs.wisc.edu> - 2.2.3-1
+- Fix traceback if JOB_ROUTER_ENTRIES not present (SOFTWARE-2814)
+- Improve POSIX compatability
+
 * Fri Jul 21 2017 Brian Lin <blin@cs.wisc.edu> - 2.2.2-1
 - Do not hold jobs with expired proxy (SOFTWARE-2803)
 - Only warn about configuration if osg-configure is present (SOFTWARE-2805)

src/condor_ce_client_env_bootstrap

@@ -6,6 +6,6 @@ export _condor_CLASSAD_USER_LIBS=
 
 # Instead of changing the default in 01-common-auth.conf, we set client auth methods
 # with an env variable. This way, only condor_ce_* tools are affected.
-if [ "$_condor_SEC_CLIENT_AUTHENTICATION_METHODS" == "" ]; then
+if [ "$_condor_SEC_CLIENT_AUTHENTICATION_METHODS" = "" ]; then
     export _condor_SEC_CLIENT_AUTHENTICATION_METHODS=GSI,FS
 fi

src/condor_ce_startup

@@ -3,15 +3,16 @@
 fail() {
     RETVAL="$1"
     MSG="$2"
-    echo -e "\nERROR: $MSG"
+    echo
+    echo "ERROR: $MSG"
     exit $RETVAL
 }
 
 # Source condor-ce environment
 [ -f /usr/share/condor-ce/condor_ce_env_bootstrap ] && . /usr/share/condor-ce/condor_ce_env_bootstrap
 
 # Skip sanity checks if running as a central collector
-if [[ "$1" != "collector" ]]; then
+if [ "$1" != "collector" ]; then
     # Check value of QUEUE_SUPER_USER_MAY_IMPERSONATE for HTCondor batch systems
     condor_ce_config_val -config 2>&1 | grep '02-ce-condor.conf' > /dev/null
     if [ $? -eq 0 ]; then
@@ -36,7 +37,7 @@ fi
 
 # The hostname is controlled by setting the environment variable
 # $CONDORCE_HOSTNAME in /etc/sysconfig/condor-ce.
-if [ "X$CONDORCE_HOSTNAME" == "X" ]; then
+if [ "X$CONDORCE_HOSTNAME" = "X" ]; then
     exec condor_master "$@"
 fi
 

tests/test_inside_docker.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -xe
+#!/bin/bash -xe
 
 OS_VERSION=$1