Update icon and improve deb package (PhoenicisOrg#1670)

aiamuzz · Dec 30, 2018 · 9ba790a · 9ba790a
1 parent b941b8d
commit 9ba790a
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 40 deletions.
diff --git a/phoenicis-dist/src/deb/control/control b/phoenicis-dist/src/deb/control/control
diff --git a/phoenicis-dist/src/deb/scripts/phoenicis-cli b/phoenicis-dist/src/deb/scripts/phoenicis-cli
diff --git a/phoenicis-dist/src/deb/scripts/phoenicis-cli.desktop b/phoenicis-dist/src/deb/scripts/phoenicis-cli.desktop
diff --git a/phoenicis-dist/src/deb/scripts/phoenicis-javafx b/phoenicis-dist/src/deb/scripts/phoenicis-javafx
diff --git a/phoenicis-dist/src/deb/scripts/phoenicis-javafx.desktop b/phoenicis-dist/src/deb/scripts/phoenicis-javafx.desktop
diff --git a/phoenicis-dist/src/flatpak/org.phoenicis.playonlinux.desktop b/phoenicis-dist/src/flatpak/org.phoenicis.playonlinux.desktop
@@ -7,6 +7,6 @@ Terminal=false
 Type=Application
 MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;
 Icon=org.phoenicis.playonlinux
-Categories=Utility
+Categories=Game;Utility
 Keywords=Phoenicis;PlayOnLinux;Wine;
 
diff --git a/phoenicis-dist/src/flatpak/phoenicis_16.png b/phoenicis-dist/src/flatpak/phoenicis_16.png
diff --git a/phoenicis-dist/src/flatpak/phoenicis_22.png b/phoenicis-dist/src/flatpak/phoenicis_22.png
diff --git a/phoenicis-dist/src/flatpak/phoenicis_24.png b/phoenicis-dist/src/flatpak/phoenicis_24.png
diff --git a/phoenicis-dist/src/flatpak/phoenicis_256.png b/phoenicis-dist/src/flatpak/phoenicis_256.png
diff --git a/phoenicis-dist/src/flatpak/phoenicis_32.png b/phoenicis-dist/src/flatpak/phoenicis_32.png
diff --git a/phoenicis-dist/src/flatpak/phoenicis_48.png b/phoenicis-dist/src/flatpak/phoenicis_48.png
diff --git a/phoenicis-dist/src/flatpak/phoenicis_64.png b/phoenicis-dist/src/flatpak/phoenicis_64.png
diff --git a/phoenicis-dist/src/launchers/phoenicis b/phoenicis-dist/src/launchers/phoenicis
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/share/phoenicis/PhoenicisPlayOnLinux "$@"
diff --git a/phoenicis-dist/src/resources/Phoenicis.desktop b/phoenicis-dist/src/resources/Phoenicis.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Phoenicis PlayOnLinux
+GenericName=Phoenicis PlayOnLinux
+Comment=Phoenicis
+Type=Application
+Exec=phoenicis %F
+Icon=phoenicis
+Categories=Game;Utility;
diff --git a/phoenicis-dist/src/resources/phoenicis-16.png b/phoenicis-dist/src/resources/phoenicis-16.png
diff --git a/phoenicis-dist/src/resources/phoenicis-32.png b/phoenicis-dist/src/resources/phoenicis-32.png
diff --git a/phoenicis-dist/src/resources/icon.png → phoenicis-dist/src/resources/phoenicis.png b/phoenicis-dist/src/resources/icon.png → phoenicis-dist/src/resources/phoenicis.png
diff --git a/phoenicis-dist/src/scripts/phoenicis-create-package.sh b/phoenicis-dist/src/scripts/phoenicis-create-package.sh
@@ -62,7 +62,43 @@ fi
 
 if [ "$PHOENICIS_OPERATING_SYSTEM" == "Linux" ]; then
     jpackager create-image "${PHOENICIS_JPACKAGER_ARGUMENTS[@]}"  --linux-bundle-name "phoenicis-playonlinux"
-    jpackager create-installer deb "${PHOENICIS_JPACKAGER_ARGUMENTS[@]}" --linux-package-deps "unzip, wget, xterm | x-terminal-emulator, imagemagick, cabextract, icoutils, p7zip-full, curl, winbind" --linux-deb-maintainer "PlayOnLinux Packaging <[email protected]>" --linux-bundle-name "phoenicis-playonlinux"
-fi
-
 
+    packageName="Phoenicis_$VERSION"
+    cd "$PHOENICIS_TARGET"
+    rmdir packages/PhoenicisPlayOnLinux/
+    rm -rf "packages/phoenicis" 2> /dev/null
+    mv packages/Phoenicis\ PlayOnLinux/ packages/phoenicis
+    rm -rf "$packageName" 2> /dev/null
+    mkdir -p "$packageName/DEBIAN/"
+
+    cat << EOF > "$packageName/DEBIAN/control"
+Package: phoenicis-playonlinux
+Version: $VERSION
+Section: misc
+Priority: optional
+Architecture: all
+Depends: unzip, wget, xterm | x-terminal-emulator, python, imagemagick, cabextract, icoutils, p7zip-full, curl
+Maintainer: PlayOnLinux Packaging <[email protected]>
+Description: This program is a front-end for wine.
+ It permits you to install Windows Games and softwares
+ on Linux. It allows you to manage differents virtual hard drive,
+ and several wine versions.
+ Copyright 2011-2019 PlayOnLinux team <[email protected]>
+EOF
+
+    mkdir -p $packageName/usr/share/applications
+    mkdir -p $packageName/usr/share/pixmaps
+    mkdir -p $packageName/usr/bin
+
+    cp -a packages/phoenicis $packageName/usr/share/
+    cp -a "$SCRIPT_PATH/../launchers/phoenicis" $packageName/usr/bin/phoenicis
+    chmod +x $packageName/usr/bin/phoenicis
+
+    cp "$SCRIPT_PATH/../resources/Phoenicis.desktop" "$packageName/usr/share/applications"
+    cp "$SCRIPT_PATH/../resources/phoenicis.png" "$packageName/usr/share/pixmaps"
+    cp "$SCRIPT_PATH/../resources/phoenicis-16.png" "$packageName/usr/share/pixmaps"
+    cp "$SCRIPT_PATH/../resources/phoenicis-32.png" "$packageName/usr/share/pixmaps"
+
+    fakeroot dpkg-deb --build "$packageName"
+    rm -rf deb
+fi
diff --git a/...nicis-javafx/src/main/resources/org/phoenicis/javafx/views/common/phoenicis.png b/...nicis-javafx/src/main/resources/org/phoenicis/javafx/views/common/phoenicis.png
diff --git a/...cis-javafx/src/main/resources/org/phoenicis/javafx/views/common/phoenicis32.png b/...cis-javafx/src/main/resources/org/phoenicis/javafx/views/common/phoenicis32.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		/usr/share/phoenicis/PhoenicisPlayOnLinux "$@"