Fix store

Author: pdulvp

fetch-stable.sh

@@ -22,6 +22,13 @@ NEXT_SHA=$(echo $NEXT_VERSION | md5sum | cut -d" " -f 1)
 echo "NEXT_VERSION=$NEXT_VERSION"
 echo "NEXT_SHA=$NEXT_SHA"
 
+SUFFIX=$(cat package.json | grep -o -P "(?<=\"suffix\"\: \")([^\"])+")
+if [ $SUFFIX != "" ]; then 
+  SUFFIX="-$SUFFIX"
+fi
+QPKG_VER=$SERVER_VERSION$SUFFIX
+echo "QPKG_VER=$QPKG_VER"
+
 if [ "$CURRENT_VERSION" == "$NEXT_VERSION" ] && [ "$CURRENT_SHA" == "$NEXT_SHA" ]; then
     echo -e "\033[0;36mNo new release \033[0m"
     exit;
@@ -82,7 +89,7 @@ proceed() {
   mkdir output
   cp -rf packaging/* output
 
-  sed -i "s/^QPKG_VER=.*$/QPKG_VER=\"$SERVER_VERSION\"/" output/qpkg.cfg
+  sed -i "s/^QPKG_VER=.*$/QPKG_VER=\"$QPKG_VER\"/" output/qpkg.cfg
 
   if ! ./jellyfin-server.sh "$ARCH" "$SERVER_VERSION"; then
       exit $?

package.sh

@@ -1,17 +1,9 @@
 #!/bin/bash
 ARCH=$1
 FFMPEG=$2
-SUFFIX=$(cat package.json | jq -r .suffix)
-if [ "$SUFFIX" != "" ]; then 
-  SUFFIX="-$SUFFIX"
-fi
 
 cd output; /usr/share/qdk2/QDK/bin/qbuild ; cd ..
 
-#if [ "$SUFFIX" != "" ]; then 
-#  for filename in output/build/*.qpkg; do mv "$filename" "${filename%%.qpkg}$SUFFIX.qpkg"; done;
-#  for filename in output/build/*.qpkg.md5; do mv "$filename" "${filename%%.qpkg.md5}$SUFFIX.qpkg.md5"; done;
-#fi
 if [ "$ARCH" != "amd64" ]; then 
   for filename in output/build/*.qpkg; do mv "$filename" "${filename%%.qpkg}_$ARCH.qpkg"; done;
   for filename in output/build/*.qpkg.md5; do mv "$filename" "${filename%%.qpkg.md5}_$ARCH.qpkg.md5"; done;

push.sh

@@ -14,7 +14,7 @@ fi
 RELEASE_NAME="${SERVER_VERSION}${SUFFIX}"
 TAG_VERSION="${VERSION}${SUFFIX}_${VERSION_SHA:0:8}"
 
-LABEL=$SERVER_VERSION
+LABEL=$RELEASE_NAME
 DESC="Version based on: \`jellyfin-server_$SERVER_VERSION\` \`jellyfin-web_$WEB_VERSION\` \`jellyfin-ffmpeg_$FFMPEG_VERSION\` \`jellyfin-ffmpeg5_$FFMPEG5_VERSION\`"
 
 git pull bot HEAD
@@ -34,7 +34,7 @@ echo "$RELEASE_ID"
 RELEASE_ID=`echo $RELEASE_ID | grep -o -P "(?<=\"id\": )\d+" | head -n 1`
 echo "RELEASE=$RELEASE_ID"
 
-for FILE in $(find build/ -name "jellyfin_*$SERVER_VERSION*.qpkg"); do
+for FILE in $(find build/ -name "jellyfin_*$RELEASE_NAME*.qpkg"); do
   NAME=$(basename $FILE);
   echo "Publish $FILE"
   curl -X POST \