Commit 2b947098 authored by Dmitry Kazakov's avatar Dmitry Kazakov

Merge branch 'master' of invent.kde.org:kde/krita

parents 65df2a9a b9b20f33
......@@ -93,7 +93,7 @@ cd $KRITA_SOURCES
if [[ -d .git ]]; then
GIT_REVISION=$(git rev-parse --short HEAD)
export VERSION=$KRITA_VERSION-$GIT_REVISION
VERSION_TYPE="developement"
VERSION_TYPE="development"
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
if [ "$BRANCH" = "master" ]; then
CHANNEL="Next"
......@@ -124,13 +124,13 @@ sed -e "s|<release version=\"\" date=\"\" />|<release version=\"$VERSION\" date=
# set zsync url for linuxdeployqt
if [ "$CHANNEL" = "Next" ]; then
ZSYNC_URL="zsync|https://binary-factory.kde.org/job/Krita_Nightly_Appimage_Build/lastSuccessfulBuild/artifact/krita-${CHANNEL}-x86_64.appimage.zsync"
ZSYNC_URL="zsync|https://binary-factory.kde.org/job/Krita_Nightly_Appimage_Build/lastSuccessfulBuild/artifact/Krita-${CHANNEL}-x86_64.appimage.zsync"
elif [ "$CHANNEL" = "Plus" ]; then
ZSYNC_URL="zsync|https://binary-factory.kde.org/job/Krita_Stable_Appimage_Build/lastSuccessfulBuild/artifact/krita-${CHANNEL}-x86_64.appimage.zsync"
ZSYNC_URL="zsync|https://binary-factory.kde.org/job/Krita_Stable_Appimage_Build/lastSuccessfulBuild/artifact/Krita-${CHANNEL}-x86_64.appimage.zsync"
elif [ "$CHANNEL" = "Stable" ]; then
ZSYNC_URL="zsync|https://download.kde.org/stable/krita/updates/krita-${CHANNEL}-x86_64.appimage.zsync"
ZSYNC_URL="zsync|https://download.kde.org/stable/krita/updates/Krita-${CHANNEL}-x86_64.appimage.zsync"
elif [ "$CHANNEL" = "Beta" ]; then
ZSYNC_URL="zsync|https://download.kde.org/unstable/krita/updates/krita-${CHANNEL}-x86_64.appimage.zsync"
ZSYNC_URL="zsync|https://download.kde.org/unstable/krita/updates/Krita-${CHANNEL}-x86_64.appimage.zsync"
fi
# Return to our build root
cd $BUILD_PREFIX
......
......@@ -36,6 +36,6 @@ fi
zsyncmake -u "${URL}/$(basename ${APPIMAGE_PATH})" -o $APPIMAGE_PATH.zsync.new $APPIMAGE_PATH
ret=$?
if [ $ret -eq 0 ]; then
mv $APPIMAGE_PATH.zsync.new krita-${CHANNEL}-x86_64.appimage.zsync
mv $APPIMAGE_PATH.zsync.new Krita-${CHANNEL}-x86_64.appimage.zsync
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment