diff options
| author | Charadon <dev@iotib.net> | 2022-07-26 05:50:10 -0400 |
|---|---|---|
| committer | Charadon <dev@iotib.net> | 2022-07-26 05:50:10 -0400 |
| commit | 6176d566f2ecf0c97a2aa545626ccfe26ebb8e79 (patch) | |
| tree | 01eaabf79ce4b43189cb63337c803387112e0319 | |
| parent | 78462c3cde93bc028b23369203f78ef080e3fdee (diff) | |
| download | dscip-6176d566f2ecf0c97a2aa545626ccfe26ebb8e79.tar.gz | |
Added a couple better defaults
| -rwxr-xr-x | dscip | 4 | ||||
| -rwxr-xr-x | post.sh | 7 | ||||
| -rwxr-xr-x | pre.sh | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/dscip b/dscip index d66be1f..682ebe7 100755 --- a/dscip +++ b/dscip @@ -48,11 +48,11 @@ echo "$$" > "$WORKING_DIRECTORY/LOCK" build () { # Remove old output - rm -f output.txt + rm -f "$WORKING_DIRECTORY"/output.txt # Print variables # { echo "################################################################################"; - date; + printf "%s" "$(date) | $DSCIP_NAME" echo "################################################################################"; echo "DSCIP_GITREPO=$DSCIP_GITREPO"; echo "DSCIP_GITMODE=$DSCIP_GITMODE"; diff --git a/post.sh b/post.sh index 93b324e..8d5404b 100755 --- a/post.sh +++ b/post.sh @@ -6,7 +6,8 @@ set -eu # Example below. # # TAR up the program. # -bsdtar -a -cf program-$CURRENT_COMMIT.tar.gz app/ +bsdtar --options xz:compression-level=9 -a -cf \ +$DSCIP_NAME-$(uname)-$(uname -r)_$(uname -m)-$CURRENT_COMMIT.tar.xz app/ # Send the artifacts to an FTP server. # ftp -in <<EOF @@ -14,8 +15,8 @@ open 192.168.255.255 user username p@ssw0rd mkdir $CURRENT_COMMIT cd $CURRENT_COMMIT -put program-$CURRENT_COMMIT.tar.gz program-$CURRENT_COMMIT.tar.gz -put $WORKING_DIRECTORY/output.txt $CURRENT_COMMIT-output.txt +put $DSCIP_NAME-$(uname)-$(uname -r)_$(uname -m)-$CURRENT_COMMIT.tar.xz $DSCIP_NAME-$(uname)-$(uname -r)_$(uname -m)-$CURRENT_COMMIT.tar.xz +put $WORKING_DIRECTORY/output.txt output-$CURRENT_COMMIT.txt close bye EOF diff --git a/pre.sh b/pre.sh index 824ea8c..c361e75 100755 --- a/pre.sh +++ b/pre.sh @@ -5,8 +5,8 @@ set -eu # Below is an example. # # Build user implied to have sudo access to apt update and upgrade # -sudo apt update -sudo apt upgrade +sudo apt update -y +sudo apt upgrade -y # Including assets with game code is usually a bad idea, so we grab the assets # # from a mirror. # |