QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-18 04:19:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #756 from QuasarApp/task_755

Browse Source 
Fix a shortcuts array for debian pacakges
This commit is contained in:
Andrei Yankovich 2023-06-13 10:30:01 +03:00 committed by GitHub
commit de25aa3f10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Deploy/src/Distributions/Templates/deb/DEBIAN/postinst
View File

@ -21,7 +21,7 @@ function createShortCut {
echo "Encoding=UTF-8" >> $DEST_FILE echo "Encoding=UTF-8" >> $DEST_FILE
echo "Name=$DEST_NAME" >> $DEST_FILE echo "Name=$DEST_NAME" >> $DEST_FILE
echo "Type=Application" >> $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 "Terminal=false" >> $DEST_FILE
echo "Exec=$SRC_FILE" >> $DEST_FILE echo "Exec=$SRC_FILE" >> $DEST_FILE
@ -34,8 +34,6 @@ echo "Available commands:"
for app in "${APPS[@]}" for app in "${APPS[@]}"
do do
DEST_NAME=$app
if [ ! -e /usr/bin/"${app,,}" ]; then if [ ! -e /usr/bin/"${app,,}" ]; then
ln -s "$TARGET_DIR/$app.sh" /usr/bin/"${app,,}" ln -s "$TARGET_DIR/$app.sh" /usr/bin/"${app,,}"
echo "${app,,}" echo "${app,,}"
@ -45,10 +43,10 @@ done
for app in "${APPS_SHORTCUTS[@]}" for app in "${APPS_SHORTCUTS[@]}"
do do
DEST_NAME=$app DEST_NAME=${app%.*}
SRC_FILE="$TARGET_DIR/$app" SRC_FILE="$TARGET_DIR/$app"
DEST_FILE="/usr/share/applications/${app%.*}.desktop" DEST_FILE="/usr/share/applications/${DEST_NAME}.desktop"
createShortCut createShortCut
done done

2
src/Deploy/src/Distributions/idistribution.cpp
View File

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