diff --git a/env-builder-data/build/script/packet/synfigstudio-debugnsis.sh b/env-builder-data/build/script/packet/synfigstudio-debugnsis.sh index 88ba494..3235941 100644 --- a/env-builder-data/build/script/packet/synfigstudio-debugnsis.sh +++ b/env-builder-data/build/script/packet/synfigstudio-debugnsis.sh @@ -3,3 +3,4 @@ source "$PACKET_SCRIPT_DIR/synfigstudio-nsis.sh" DEPS=`echo "$DEPS" | sed "s|synfigstudio-master|synfigstudio-debug|g"` PK_URL="https://github.com/blackwarthog/synfig.git" PK_GIT_CHECKOUT="origin/debug" +PK_LICENSE_FILE="license-synfigstudio-debug" diff --git a/env-builder-data/build/script/packet/synfigstudio-nsis.sh b/env-builder-data/build/script/packet/synfigstudio-nsis.sh index befbffd..0312a58 100644 --- a/env-builder-data/build/script/packet/synfigstudio-nsis.sh +++ b/env-builder-data/build/script/packet/synfigstudio-nsis.sh @@ -4,7 +4,7 @@ DEPS_NATIVE="nsis-2.50" PK_PYTHON_DIRNAME="python" PK_PYTHON_ARCHIVE="portable-python-3.2.5.1.zip" PK_PYTHON_URL="https://download.tuxfamily.org/synfig/packages/sources/$PK_PYTHON_ARCHIVE" - +PK_LICENSE_FILE="license-synfigstudio-master" pkfunc_register_file() { local FILE=$1 @@ -123,7 +123,7 @@ pkinstall_release() { !define PK_EXECUTABLE "bin\\synfigstudio.exe" !define PK_ICON "share\\pixmaps\\synfig_icon.ico" !define PK_DOCUMENT_ICON "share\\pixmaps\\sif_icon.ico" -!define PK_LICENSE ".\\license\\license-synfigstudio-master" +!define PK_LICENSE ".\\license\\${PK_LICENSE_FILE}" EOF # let's go diff --git a/publish/publish.sh b/publish/publish.sh index a071ed7..bcf4cad 100755 --- a/publish/publish.sh +++ b/publish/publish.sh @@ -16,7 +16,7 @@ publish() { local VERSION=`cat "$VERSION_FILE" | cut -d'-' -f 1` local COMMIT=`cat "$VERSION_FILE" | cut -d'-' -f 2-` COMMIT="${COMMIT:0:5}" - local DATE=`date -u +%y.%m.%d` + local DATE=`date -u +%Y.%m.%d` if [ -z "$COMMIT" ]; then echo "Cannot find version, pheraps package not ready. Cancel." return 1