From 64af82119d2c117b40b4f7dc17a15b750f5bda4a Mon Sep 17 00:00:00 2001 From: sneurlax Date: Tue, 25 Apr 2023 12:09:22 -0500 Subject: [PATCH 1/3] make android script executable --- scripts/android/publish.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/android/publish.sh diff --git a/scripts/android/publish.sh b/scripts/android/publish.sh old mode 100644 new mode 100755 From 35a1a8633bcd0cd6af7ff28bec38d586244e6dcb Mon Sep 17 00:00:00 2001 From: sneurlax Date: Tue, 25 Apr 2023 13:24:41 -0500 Subject: [PATCH 2/3] make comment more descriptive --- scripts/android/publish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/android/publish.sh b/scripts/android/publish.sh index 522261a4ad..153a8181bd 100755 --- a/scripts/android/publish.sh +++ b/scripts/android/publish.sh @@ -36,7 +36,7 @@ do git tag "${OS}_${TARGET}_${TAG_COMMIT}" git push --tags else - echo "$TARGET not found!" + echo "$TARGET not found, either $TARGET_PATH/$MONERO_BIN or $TARGET_PATH/$WOWNERO_BIN!" fi fi done From bf80fd6c2c495dc176ebf857fc0464eaca8ecf77 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Tue, 25 Apr 2023 13:25:05 -0500 Subject: [PATCH 3/3] checkout OS/TARGET in linux publish script --- scripts/linux/publish.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/linux/publish.sh b/scripts/linux/publish.sh index 54972af34e..7e3ea80909 100644 --- a/scripts/linux/publish.sh +++ b/scripts/linux/publish.sh @@ -25,14 +25,14 @@ else ARCH_PATH=$TARGET if [ -f "$TARGET_PATH/$MONERO_BIN" -a -f "$TARGET_PATH/$WOWNERO_BIN" ]; then - git checkout "${OS}_${TARGET}_${TAG_COMMIT}" || git checkout -b "${OS}_${TARGET}_${TAG_COMMIT}" + git checkout $OS/$TARGET || git checkout -b $OS/$TARGET if [ ! -d "$OS/$ARCH_PATH" ]; then mkdir -p "$OS/$ARCH_PATH" fi cp -rf "$TARGET_PATH/$MONERO_BIN" "$OS/$ARCH_PATH/$MONERO_BIN" cp -rf "$TARGET_PATH/$WOWNERO_BIN" "$OS/$ARCH_PATH/$WOWNERO_BIN" git add . - git push origin $OS/$TARGET + git commit -m "$TAG_COMMIT" git push origin $OS/$TARGET git tag "${OS}_${TARGET}_${TAG_COMMIT}" git push --tags