Merge pull request #132 from bradmwilliams/ansible-rebuild-revert

Ansible rebuild revert

Author: bradmwilliams

ansible/rebuild_module.sh

@@ -1,37 +1,26 @@
 #!/usr/bin/env bash
 
 # Directory in which this script resides
-ANSIBLE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-TEMPLATE_FILE="$ANSIBLE_DIR/roles/openshift_client_python/library/openshift_client_python.template.py"
-
-if [ -n "$1" ]
-then
-  echo "Running in container mode"
-  TEMP_DIR="$1"
-  OUTPUT_FILE="$TEMP_DIR/openshift_client_python.py"
-  DIGEST_FILE="$TEMP_DIR/rebuild_module.digest"
-else
-  OUTPUT_FILE="$ANSIBLE_DIR/roles/openshift_client_python/library/openshift_client_python.py"
-  DIGEST_FILE="$ANSIBLE_DIR/rebuild_module.digest"
-fi
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+TEMPLATE_FILE="$DIR/roles/openshift_client_python/library/openshift_client_python.template.py"
+OUTPUT_FILE="$DIR/roles/openshift_client_python/library/openshift_client_python.py"
 
 if [[ ! -f "$TEMPLATE_FILE" ]]; then
     echo "Unable to find template file: $TEMPLATE_FILE"
     exit 1
 fi
 
-PACKAGES_DIR="$ANSIBLE_DIR/../packages"
+PACKAGES_DIR="$DIR/../packages"
 if [[ ! -d "$PACKAGES_DIR" ]]; then
     echo "Unable to find packages directory: $PACKAGES_DIR"
     exit 1
 fi
-pushd "$PACKAGES_DIR"
 
+pushd "$PACKAGES_DIR"
 # Update module digest so that pr.groovy can ensure it is run after each module change
-cat $(find openshift/ -name '*.py' | sort -d) | md5sum > $DIGEST_FILE
-ENCODED_TGZ=$(tar c --owner=0 --numeric-owner --group=0 --mtime='UTC 2019-01-01' $(find openshift/ -name '*.py' | sort -d) | gzip -c -n | base64 --wrap=0)
-
+cat $(find openshift/ -name '*.py' | sort) | md5sum > $DIR/rebuild_module.digest
+ENCODED_TGZ=$(tar c --owner=0 --numeric-owner --group=0 --mtime='UTC 2019-01-01' $(find openshift/ -name '*.py' | sort) | gzip -c -n | base64 --wrap=0)
 popd
 
 echo "#!/usr/bin/env python" > $OUTPUT_FILE
@@ -56,4 +45,4 @@ done < "$TEMPLATE_FILE"
 if [[ "$replaced" != "1" ]]; then
     echo "Unable to find replacement pattern in template"
     exit 1
-fi
+fi