Merge pull request #756 from QuasarApp/task_755

Fix a shortcuts array for debian pacakges
QuasarApp · Jun 13, 2023 · de25aa3 · de25aa3
2 parents 60d8148 + d35f0c3
commit de25aa3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Deploy/src/Distributions/Templates/deb/DEBIAN/postinst b/src/Deploy/src/Distributions/Templates/deb/DEBIAN/postinst
@@ -21,7 +21,7 @@ function createShortCut {
         echo "Encoding=UTF-8" >> $DEST_FILE
         echo "Name=$DEST_NAME" >> $DEST_FILE
         echo "Type=Application" >> $DEST_FILE
-        echo "Icon=$CQT_INSTALL_DEB_DIR/icons/${SRC_FILE%%.*}.png" >> $DEST_FILE
+        echo "Icon=$TARGET_DIR/icons/${DEST_NAME}.png" >> $DEST_FILE
         echo "Terminal=false" >> $DEST_FILE
         echo "Exec=$SRC_FILE" >> $DEST_FILE
 
@@ -34,8 +34,6 @@ echo "Available commands:"
 for app in "${APPS[@]}"
 do
 
-    DEST_NAME=$app
-
     if [ ! -e /usr/bin/"${app,,}" ]; then
         ln -s "$TARGET_DIR/$app.sh" /usr/bin/"${app,,}"
         echo "${app,,}"
@@ -45,10 +43,10 @@ done
 for app in "${APPS_SHORTCUTS[@]}"
 do
 
-    DEST_NAME=$app
+    DEST_NAME=${app%.*}
 
     SRC_FILE="$TARGET_DIR/$app"
-    DEST_FILE="/usr/share/applications/${app%.*}.desktop"
+    DEST_FILE="/usr/share/applications/${DEST_NAME}.desktop"
     createShortCut
 done
 

diff --git a/src/Deploy/src/Distributions/idistribution.cpp b/src/Deploy/src/Distributions/idistribution.cpp
@@ -252,7 +252,7 @@ bool iDistribution::collectInfo(const DistroModule& pkg,
     info.Custom["[\"array\", \"of\", \"shortcut\", \"cmds\"]"] = cmdShortCutsArray;
 
     info.Custom["$BASH_ARRAY_APPLICATIONS"] = bashArray;
-    info.Custom["$BASH_ARRAY_APPLICATIONS"] = bashArray;
+    info.Custom["$BASH_ARRAY_SHORTCUTS_APPLICATIONS"] = bashShortCutsArray;
 
     if (info.Name.isEmpty()) {
         info.Name = "Application";