diff options
| author | Charadon <dev@iotib.net> | 2022-08-06 12:18:58 -0400 |
|---|---|---|
| committer | Charadon <dev@iotib.net> | 2022-08-06 12:18:58 -0400 |
| commit | 9df670eeb430f92da25d6dd0f0c8874703e1feb0 (patch) | |
| tree | 5531049ac5943dc04a4265cdc99a677acb846b40 | |
| parent | 6ec938cb04edde600e20e20980258b58231b7639 (diff) | |
| download | dscip-9df670eeb430f92da25d6dd0f0c8874703e1feb0.tar.gz | |
Changed some defaults, and made pid detection more portable hopefully.
| -rwxr-xr-x | dscip | 2 | ||||
| -rwxr-xr-x | failed.sh | 1 | ||||
| -rwxr-xr-x | post.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/dscip b/dscip index 5d86b93..4958fb1 100755 --- a/dscip +++ b/dscip @@ -35,7 +35,7 @@ set -u # Check if script is currently running, and if not, reset LOCK # if [ -f "$WORKING_DIRECTORY/LOCK" ]; then LOCKED_PID=$(cat "$WORKING_DIRECTORY/LOCK") - if ps -p "$LOCKED_PID" > /dev/null; then + if ps -aux | grep [^]]"$LOCKED_PID" > /dev/null; then echo "Script still running. Exiting..." exit 0 else diff --git a/failed.sh b/failed.sh index e1e0f02..1477e12 100755 --- a/failed.sh +++ b/failed.sh @@ -6,6 +6,7 @@ set -eu # Below is an example of uploading the output.txt to an ftp server. ftp -in <<EOF open 192.168.1.5 +user username password mkdir $DSCIP_NAME cd $DSCIP_NAME mkdir $CURRENT_COMMIT diff --git a/post.sh b/post.sh index 307aa5a..9ad6292 100755 --- a/post.sh +++ b/post.sh @@ -6,7 +6,7 @@ set -eu # Example below. # # TAR up the program. # -bsdtar --options xz:compression-level=9 -a -cf \ +bsdtar -a -cf \ $DSCIP_NAME-$(uname)-$(uname -r)_$(uname -m)-$CURRENT_COMMIT.tar.xz app/ # Send the artifacts to an FTP server. # |