From 45774fe0e54d63043d505867137df6b7e60da690 Mon Sep 17 00:00:00 2001 From: fredboy Date: Wed, 17 Apr 2024 12:27:03 +0700 Subject: [PATCH] Add attribution to so script --- COPYING | 2 ++ gen-changelog.sh | 4 ++++ make-release.sh | 31 +------------------------------ require-celan-work-tree.sh | 31 +++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 30 deletions(-) create mode 100644 require-celan-work-tree.sh diff --git a/COPYING b/COPYING index 37400b6..6d0eb3a 100644 --- a/COPYING +++ b/COPYING @@ -3,3 +3,5 @@ This game is distributed under MIT License (see LICENSE). Textures used in this game: Pixel Perfection by XSSheep is licensed under a Creative Commons Attribution-Share Alike 4.0 International License. https://creativecommons.org/licenses/by-sa/4.0/ + +Some scripts from stack overflow are distributed under applicable licenses diff --git a/gen-changelog.sh b/gen-changelog.sh index f2959c1..5c6007e 100755 --- a/gen-changelog.sh +++ b/gen-changelog.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# Waku-2 CC BY-SA 3.0 +# https://stackoverflow.com/a/46033999 +# https://creativecommons.org/licenses/by-sa/3.0/ + previous_tag=0 i=0 for current_tag in $(git tag --sort=-creatordate) diff --git a/make-release.sh b/make-release.sh index e593734..5e3f71a 100755 --- a/make-release.sh +++ b/make-release.sh @@ -1,40 +1,11 @@ #!/usr/bin/env bash -require_clean_work_tree() { - # Update the index - git update-index -q --ignore-submodules --refresh - err=0 - - # Disallow unstaged changes in the working tree - if ! git diff-files --quiet --ignore-submodules -- - then - echo >&2 "cannot $1: you have unstaged changes." - git diff-files --name-status -r --ignore-submodules -- >&2 - err=1 - fi - - # Disallow uncommitted changes in the index - if ! git diff-index --cached --quiet HEAD --ignore-submodules -- - then - echo >&2 "cannot $1: your index contains uncommitted changes." - git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2 - err=1 - fi - - if [ $err = 1 ] - then - echo >&2 "Please commit or stash them." - exit 1 - fi -} - - if [[ ! $1 ]]; then echo "usage: $0 versionName" exit fi -require_clean_work_tree "$0" +./require_clean_work_tree "$0" release_dir="release-$1" diff --git a/require-celan-work-tree.sh b/require-celan-work-tree.sh new file mode 100644 index 0000000..cdd7e75 --- /dev/null +++ b/require-celan-work-tree.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# VonC CC BY-SA 4.0 +# https://stackoverflow.com/a/3879077 +# https://creativecommons.org/licenses/by-sa/4.0/ + + # Update the index + git update-index -q --ignore-submodules --refresh + err=0 + + # Disallow unstaged changes in the working tree + if ! git diff-files --quiet --ignore-submodules -- + then + echo >&2 "cannot $1: you have unstaged changes." + git diff-files --name-status -r --ignore-submodules -- >&2 + err=1 + fi + + # Disallow uncommitted changes in the index + if ! git diff-index --cached --quiet HEAD --ignore-submodules -- + then + echo >&2 "cannot $1: your index contains uncommitted changes." + git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2 + err=1 + fi + + if [ $err = 1 ] + then + echo >&2 "Please commit or stash them." + exit 1 + fi -- 2.29.2