From a1e444d0f8b832b69d8ddf8293831450664f72e3 Mon Sep 17 00:00:00 2001 From: Finn Ellis Date: Sun, 8 Mar 2020 04:45:22 -0700 Subject: [PATCH 1/5] support package names with spaces in them --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 07d06bb..d60d42e 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -15,5 +15,5 @@ then versionArguement="--userversion-file ${VERSION_FILE}" fi -echo "butler push $PACKAGE $ITCH_USER/$ITCH_GAME:$CHANNEL ${versionArguement}" -butler push $PACKAGE $ITCH_USER/$ITCH_GAME:$CHANNEL ${versionArguement} \ No newline at end of file +echo "butler push \"$PACKAGE\" $ITCH_USER/$ITCH_GAME:$CHANNEL ${versionArguement}" +butler push "$PACKAGE" $ITCH_USER/$ITCH_GAME:$CHANNEL ${versionArguement} From e244514515f8cb1167eca70d8b8715f86e935ffd Mon Sep 17 00:00:00 2001 From: Finn Ellis Date: Sun, 8 Mar 2020 05:07:26 -0700 Subject: [PATCH 2/5] upgrade butler + typo fix --- entrypoint.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index d60d42e..74eeb2d 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,16 +4,17 @@ set -e mkdir -p ~/.config/itch echo $BUTLER_CREDENTIALS > ~/.config/itch/butler_creds +butler upgrade -versionArguement="" +versionArgument="" if [ "$VERSION" != "" ] then - versionArguement="--userversion ${VERSION}" + versionArgument="--userversion ${VERSION}" elif [ "$VERSION_FILE" != "" ] then - versionArguement="--userversion-file ${VERSION_FILE}" + versionArgument="--userversion-file ${VERSION_FILE}" fi -echo "butler push \"$PACKAGE\" $ITCH_USER/$ITCH_GAME:$CHANNEL ${versionArguement}" -butler push "$PACKAGE" $ITCH_USER/$ITCH_GAME:$CHANNEL ${versionArguement} +echo "butler push \"$PACKAGE\" $ITCH_USER/$ITCH_GAME:$CHANNEL ${versionArgument}" +butler push "$PACKAGE" $ITCH_USER/$ITCH_GAME:$CHANNEL ${versionArgument} From 7eb81c4a774cfc2c0bd67508178c48f98a4687c5 Mon Sep 17 00:00:00 2001 From: Finn Ellis Date: Sun, 8 Mar 2020 05:14:29 -0700 Subject: [PATCH 3/5] yes, really upgrade --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 74eeb2d..9430419 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,7 +4,7 @@ set -e mkdir -p ~/.config/itch echo $BUTLER_CREDENTIALS > ~/.config/itch/butler_creds -butler upgrade +butler upgrade -y versionArgument="" From d5ec0e7301b683d9710c5e38223c2a0e2465ff16 Mon Sep 17 00:00:00 2001 From: Finn Ellis Date: Sun, 8 Mar 2020 05:26:36 -0700 Subject: [PATCH 4/5] apparently this is what butler calls this --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 9430419..ad63c88 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,7 +4,7 @@ set -e mkdir -p ~/.config/itch echo $BUTLER_CREDENTIALS > ~/.config/itch/butler_creds -butler upgrade -y +butler upgrade --assume-yes versionArgument="" From 28dbb1de9b70050d45f143940ef3336e701e0873 Mon Sep 17 00:00:00 2001 From: Finn Ellis Date: Sun, 8 Mar 2020 05:34:34 -0700 Subject: [PATCH 5/5] Only upgrade the package that matters (for speed) --- Dockerfile | 5 ++--- entrypoint.sh | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8868fb..3fd30d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,13 +5,12 @@ LABEL "com.github.actions.description"="Publishes releases to Itch.io using Butl LABEL "com.github.actions.icon"="upload" LABEL "com.github.actions.color"="white" -RUN yum update -y - # Install Butler ADD https://dl.itch.ovh/butler/linux-amd64/head/butler /usr/bin/ RUN chmod +x /usr/bin/butler +RUN butler upgrade --assume-yes # Run butler push ADD entrypoint.sh /entrypoint.sh RUN chmod +x entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh index ad63c88..f9e8461 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,8 +4,6 @@ set -e mkdir -p ~/.config/itch echo $BUTLER_CREDENTIALS > ~/.config/itch/butler_creds -butler upgrade --assume-yes - versionArgument="" if [ "$VERSION" != "" ]