summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgeorgew2018-04-29 01:32:52 -0500
committergeorgew2018-04-29 01:32:52 -0500
commitd893acaf65c9687e39a720ef639b577fef0325df (patch)
treebfbd4aded601ebf5403320f81d5f32e43d81a0ed
parent13bb177c07a8bd1b690e13ef3ceccf5dd115afc4 (diff)
downloadaur-d893acaf65c9687e39a720ef639b577fef0325df.tar.gz
Launcher package v1.3
* Rebased against pokemmo-installer from debian
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD~20
-rwxr-xr-xpokemmo-launcher247
-rw-r--r--pokemmo-launcher.pngbin0 -> 224687 bytes
-rw-r--r--pokemmo.desktop9
-rw-r--r--pokemmo.install8
6 files changed, 275 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5aa2210b6fc..87cfe562cc4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,22 @@
pkgbase = pokemmo
pkgdesc = MMO based on the Pokémon Universe
- pkgver = 1.2.1
+ pkgver = 1.3
pkgrel = 1
- url = http://pokemmo.eu
+ url = https://pokemmo.eu
install = pokemmo.install
- arch = any
- license = custom
+ arch = x86_64
+ arch = i686
+ license = GPL3
depends = java-runtime
- source = https://pokemmo.eu/download_file/?id=5/pokemmo_1.2.1.rpm
- sha256sums = dc37446213a95bd6c8b8192514c68bd8ad69b53ccc6ffc18512fb5c59cd4dc07
+ depends = wget
+ depends = openssl
+ optdepends = zenity: Information/Error message UI
+ source = pokemmo-launcher
+ source = pokemmo.desktop
+ source = pokemmo-launcher.png
+ sha256sums = ccd8a41f33509c77d55dbe50bd1c8c18aea0141f3f94e2ce5015088a2a029114
+ sha256sums = 5be349827e2798bce275c16a554ab32f5aa3cf62859200effa5328c26d1233dc
+ sha256sums = 6654600c19fe4c7190b548b41d412a99b4ffbefbee0e981e6076539bca7a9a04
pkgname = pokemmo
diff --git a/PKGBUILD~ b/PKGBUILD~
deleted file mode 100644
index 309c39e3bd8..00000000000
--- a/PKGBUILD~
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Javier Fernández (WyRe) <WyRe12@gmail.com>
-# Contributer: WyRe
-
-pkgname="pokemmo"
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="MMO based on the Pokémon Universe"
-arch=('any')
-url="http://pokemmo.eu"
-license=('custom')
-depends=('java-runtime')
-install="${pkgname}.install"
-
-source=("https://pokemmo.eu/download_file/?id=5/${pkgname}_${pkgver}.rpm")
-sha256sums=('dc37446213a95bd6c8b8192514c68bd8ad69b53ccc6ffc18512fb5c59cd4dc07')
-
-package(){
- install -Dm755 "${srcdir}/usr/bin/pokemmo-launcher" "${pkgdir}/usr/bin/pokemmo-launcher"
- cp -r "${srcdir}/usr/share" "${pkgdir}/usr/share"
-}
diff --git a/pokemmo-launcher b/pokemmo-launcher
new file mode 100755
index 00000000000..451fa4849d1
--- /dev/null
+++ b/pokemmo-launcher
@@ -0,0 +1,247 @@
+#!/bin/bash
+# GPLv3
+
+addScreenshotsDir() (
+
+[[ ! -d "$XDG_CONFIG_HOME" ]] && XDG_CONFIG_HOME="$HOME/.config"
+[[ -f "$XDG_CONFIG_HOME/user-dirs.dirs" ]] && source "$XDG_CONFIG_HOME/user-dirs.dirs"
+
+if [[ -d "$XDG_PICTURES_DIR" ]]; then
+ ln -s "$XDG_PICTURES_DIR" "$POKEMMO/screenshots"
+else
+ [[ -L "$POKEMMO/screenshots" ]] && unlink "$POKEMMO/screenshots"
+ mkdir -p "$POKEMMO/screenshots"
+fi
+
+)
+
+getLauncherConfig() {
+
+while read i; do
+ case $i in
+ installed=1) PKMO_IS_INSTALLED=1 ;;
+ debugs=1) PKMO_CREATE_DEBUGS=1 ;;
+ swr=1) export LIBGL_ALWAYS_SOFTWARE=1 ;;
+ *) continue ;;
+ esac
+done <"$PKMOCONFIGDIR/pokemmo"
+
+}
+
+getJavaOpts() {
+
+JAVA_OPTS=()
+
+case "$1" in
+ client)
+ if [[ ! $SKIPJAVARAMOPTS ]]; then
+ JAVA_OPTS=(-Xms128M)
+
+ if [ -f "$POKEMMO/PokeMMO.l4j.ini" ]; then
+ JAVA_OPTS+=($(grep -oE "\-Xmx[0-9]{1,4}(M|G)" "$POKEMMO/PokeMMO.l4j.ini" || echo -- "-Xmx384M"))
+ else
+ JAVA_OPTS+=(-Xmx384M)
+ fi
+ fi
+
+ [[ $PKMO_CREATE_DEBUGS ]] && JAVA_OPTS+=(-XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=client_jvm.log)
+ [[ $LIBGL_ALWAYS_SOFTWARE ]] && JAVA_OPTS+=(-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true)
+ ;;
+ updater)
+ [[ ! $SKIPJAVARAMOPTS ]] && JAVA_OPTS=(-Xms64M -Xmx128M)
+ [[ $PKMO_CREATE_DEBUGS ]] && JAVA_OPTS+=(-XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=updater_jvm.log)
+ ;;
+esac
+
+echo "Java options were ${JAVA_OPTS[*]}"
+}
+
+showMessage() {
+ if [ "$(command -v zenity)" ]; then
+ case "$1" in
+ --info) zenity --notification --window-icon=/usr/share/pixmaps/pokemmo-launcher.png --text="$2" ; echo "INFO: $2" ;;
+ --error) zenity --error --width="250" --text="$2" ; echo "ERROR: $2" ; exit 1 ;;
+ --warn) zenity --warning --width="250" --text="$2" ; echo "WARNING: $2" ;;
+ esac
+ elif [ "$(command -v kdialog)" ]; then
+ case "$1" in
+ --info) kdialog --icon /usr/share/pixmaps/pokemmo-launcher.png --passivepopup "$2" ; echo "INFO: $2" ;;
+ --error) kdialog --error "$2" ; echo "ERROR: $2" ; exit 1 ;;
+ --warn) kdialog --sorry "$2" ; echo "WARNING: $2" ;;
+ esac
+ else
+ case "$1" in
+ --info) echo "INFO: $2" ;;
+ --error) echo "ERROR: $2" ; exit 1 ;;
+ --warn) echo "WARNING: $2" ;;
+ esac
+ fi
+}
+
+downloadPokemmo() {
+
+ [[ $(which openssl) ]] || showMessage --error "The openssl binary was not found. Please check your PATH is set correctly and restart the program."
+
+ unset DL_MIRRORS PKMO_PUBKEY MIRROR_STATUS VALIDATION_STATUS
+
+ DL_MIRRORS=(https://dl.pokemmo.eu https://files.pokemmo.eu https://dl.pokemmo.download https://dl.pokemmo.com)
+ # This keyfile is provided by the PokeMMO developers. Do not alter/remove it, it is used to confirm the source of the downloaded files!
+ PKMO_PUBKEY="-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAyfYQx1kSfIVGdGzcHmVV\nP7cbyLsMXGdLhwMnx2AD1MYgU170iFN5gHT+U248rH10L6D1UMlZK1LfCsbPkdQO\nir3C+8Do212NONyNm/7+ZGeIwbpy+jxEQH8Jfn4JYY7+Sn4qg249yW7DSY+XKvTO\ncphoXRNzSQp8u6IVj03mIw7zDA0SqMMFtnCXVP3NRmtjK1SuVVFLltFctz1Pp7f9\nuqgqnFlgD2l8/THnddTRM5IR6O9pbOXu7My0+Jli6+4zJgw5gQvgivYPCeess9gW\nRqpw66VTpMJERJYA6AIbVierAbjGmtRETRsHUOGAgo54G0oxtXXEaTWXF6n6mdgS\nE2Ra8q7P23stsSWU3mDNQjXO0XOhtAKQCZfvICxmsH3ed5hm8bEC5yga8z8m0vyZ\n71fWzP4Q3g6B+o6oDsMX1nWbV2GEHci/6nwFofgOJkLINaZfUTivAIRuxECVwjTT\na7ruRNgFlA2ciGUIIke2Ev2cYzyBA4LLARky2FZiEM0VAgMBAAE=\n-----END PUBLIC KEY-----"
+
+ for (( i=0; i<"${#DL_MIRRORS[@]}"; i++ )); do
+ echo "Trying mirror ${DL_MIRRORS[$i]}"
+
+ [[ -f "$POKEMMO/pokemmo_updater.jar" || -f "$POKEMMO/pokemmo_updater.sig256" ]] && rm -f "$POKEMMO/pokemmo_updater.jar" "$POKEMMO/pokemmo_updater.sig256"
+ MIRROR_STATUS=$( ( cd "$POKEMMO" && wget --https-only -U pokemmo_debian_setup --retry-connrefused --tries=3 --timeout=5 --waitretry=1 "${DL_MIRRORS[$i]}"/download/updater/pokemmo_updater.jar "${DL_MIRRORS[$i]}"/download/updater/pokemmo_updater.sig256 ) 2>&1)
+ r=$?
+
+ if [[ "$r" == "0" ]]; then
+ echo "Got updater from ${DL_MIRRORS[$i]}"
+
+ # `openssl` requires a filesystem to be inplace in order to read the checked key, but we don't really want to hit the disk due to security concerns
+ # so, instead, we'll abuse procfs a bit
+ exec {pkmo_fd}<<< "$(printf -- "$PKMO_PUBKEY")"
+ VALIDATION_STATUS=$(openssl dgst -sha256 -verify /proc/$$/fd/$pkmo_fd -signature "$POKEMMO"/pokemmo_updater.sig256 "$POKEMMO"/pokemmo_updater.jar)
+ exec {pkmo_fd}>&-
+
+ # Older versions of openssl could throw ambiguous exit codes depending on the type of failure (e.g. if files were missing, returned 0).
+ # This doesn't seem to be an issue now, but we'll prefer to parse the stdout instead of the exit codes for now
+ if [[ "$VALIDATION_STATUS" = "Verified OK" ]]; then
+ echo "Updater Verified OK!"
+ break
+ else
+ echo "WARNING: Downloaded jar failed validation! Jumping to next mirror"
+ fi
+ elif [[ "$r" != "0" && "${DL_MIRRORS[$i]}" = "${DL_MIRRORS[-1]}" ]]; then
+ rm -f "$POKEMMO/pokemmo_updater.jar" "$POKEMMO/pokemmo_updater.sig256"
+ showMessage --error "Failed to download the updater:\n\n$MIRROR_STATUS"
+ else
+ echo "WARNING: Failed to download updater from mirror ${DL_MIRRORS[$i]}. Jumping to next.."
+ fi
+ done
+
+ rm -f "$PKMOCONFIGDIR/pokemmo" "$POKEMMO/pokemmo_updater.sig256"
+ find "$POKEMMO" -type f -name "*.TEMPORARY" -exec rm -f {} +
+
+ # Updater exits with 1 on successful update
+ getJavaOpts "updater"
+ (cd "$POKEMMO" && java ${JAVA_OPTS[*]} -cp ./pokemmo_updater.jar com.pokeemu.updater.ClientUpdater -install -quick) && exit 1 || echo "installed=1" > "$PKMOCONFIGDIR/pokemmo"
+ rm -f "$POKEMMO/pokemmo_updater.jar"
+
+ # Post-update tasks
+ [[ ! -d "$POKEMMO/screenshots" ]] && addScreenshotsDir
+}
+
+verifyInstallation() {
+if [ ! -d "$POKEMMO" ]; then
+ if [[ -e "$POKEMMO" || -L "$POKEMMO" ]]; then
+ # Could also be a broken symlink
+ showMessage --error "(Error 3) Could not install to $POKEMMO\n\n$POKEMMO already exists,\nbut is not a directory.\n\nMove or delete this file and try again."
+ else
+ mkdir -p "$POKEMMO"
+ showMessage --info "PokeMMO is being installed to $POKEMMO"
+ downloadPokemmo
+ return
+ fi
+fi
+
+if [[ ! -r "$POKEMMO" || ! -w "$POKEMMO" || ! -x "$POKEMMO" || ! "$PKMO_IS_INSTALLED" || ! -f "$POKEMMO/PokeMMO.exe" || ! -d "$POKEMMO/data" || ! -d "$POKEMMO/lib" ]]; then
+ showMessage --warn "(Error 1) The installation is in a corrupt state.\n\nReverifying the game files."
+ # Try to fix permissions before erroring out
+ (chmod u+rwx "$POKEMMO" && find "$POKEMMO" -type d -exec chmod u+rwx {} + && find "$POKEMMO" -type f -exec chmod u+rw {} +) || showMessage --error "(Error 4) Could not fix permissions of $POKEMMO.\n\nContact PokeMMO support."
+ downloadPokemmo
+ return
+fi
+
+[[ $PKMO_REINSTALL && $PKMO_IS_INSTALLED ]] && downloadPokemmo
+[[ ! -d "$POKEMMO/screenshots" ]] && addScreenshotsDir
+}
+
+######################
+# Environment checks #
+######################
+
+[[ ! "$(command -v java)" ]] && showMessage --error "(Error 6) Java is not installed or is not executable. Exiting.."
+
+if [[ -d "$XDG_CONFIG_HOME" ]]; then
+ PKMOCONFIGDIR="$XDG_CONFIG_HOME/pokemmo"
+else
+ if [[ ! -e "$XDG_CONFIG_HOME" && -L "$XDG_CONFIG_HOME" ]]; then
+ showMessage --error "(Error 10) The configuration directory ($XDG_CONFIG_HOME/pokemmo) is disconnected.\n\nPlease update your symlink and restart the program."
+ else
+ PKMOCONFIGDIR="$HOME/.config/pokemmo"
+ fi
+fi
+
+if [ ! -d "$PKMOCONFIGDIR" ]; then
+ if [[ -e "$PKMOCONFIGDIR" || -L "$PKMOCONFIGDIR" ]]; then
+ showMessage --error "(Error 9) The configuration directory ($PKMOCONFIGDIR) already exists,\nbut is not a directory.\n\nMove or delete this file and try again."
+ else
+ mkdir -p "$PKMOCONFIGDIR"
+ fi
+fi
+
+while getopts "vhH:-:" opt; do
+ case $opt in
+ -) case "$OPTARG" in
+ skip-java-ram-opts) SKIPJAVARAMOPTS=1 ;;
+ reverify) PKMO_REINSTALL=1 ;;
+ debug) PKMO_CREATE_DEBUGS=1 ;;
+ swr) export LIBGL_ALWAYS_SOFTWARE=1 ;;
+ esac
+ ;;
+ v) set -x
+ PS4='Line ${LINENO}: '
+ ;;
+ h) printf "\
+ PokeMMO Linux Launcher v1.4\n\
+ https://pokemmo.eu/\n\n\
+ Usage: pokemmo-launcher [option...]\n\n\
+ -h Display this dialogue\n\
+ -H <dir> Set the PokeMMO directory (Default: $HOME/.local/share/pokemmo).
+ This option is persistent and may be modified in $PKMOCONFIGDIR/pokemmodir \n\
+ -v Print verbose status to stdout\n
+ --debug Enable java debug logs\n\
+ --swr Try to fallback to an available software renderer\n\
+ --reverify Reverify the game files\n\
+ --skip-java-ram-opts Use the operating system's default RAM options instead of the suggested values\n"
+ exit
+ ;;
+ H) mkdir -p "$OPTARG" || continue
+ echo "$OPTARG" > "$PKMOCONFIGDIR/pokemmodir" ;;
+ *) continue ;;
+ esac
+done
+
+#################
+# Start PokeMMO #
+#################
+
+[[ -f "$PKMOCONFIGDIR/pokemmo" ]] && getLauncherConfig
+
+POKEMMO="$HOME/.pokemmo"
+
+verifyInstallation
+
+getJavaOpts "client"
+
+if [[ $PKMO_CREATE_DEBUGS ]]; then
+ cd "$POKEMMO"
+ ( java ${JAVA_OPTS[*]} -cp ./lib/*:PokeMMO.exe com.pokeemu.client.Client ) &
+
+ client_pid=$!
+
+ echo "DEBUG: Spawned client_pid $client_pid"
+
+ rm -f "$POKEMMO/client_jvm.log"
+
+ while :; do
+ sleep 3
+ kill -3 "$client_pid" || break
+ echo "DEBUG: Threads dumped for Client JVM. Sleeping for 3 seconds.."
+ done
+
+ wait
+else
+ cd "$POKEMMO" && java ${JAVA_OPTS[*]} -cp ./lib/*:PokeMMO.exe com.pokeemu.client.Client > /dev/null
+fi
diff --git a/pokemmo-launcher.png b/pokemmo-launcher.png
new file mode 100644
index 00000000000..92dc1f76d2d
--- /dev/null
+++ b/pokemmo-launcher.png
Binary files differ
diff --git a/pokemmo.desktop b/pokemmo.desktop
new file mode 100644
index 00000000000..233be22a833
--- /dev/null
+++ b/pokemmo.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=PokeMMO
+Comment=MMO based on the Pokémon Universe
+Exec=pokemmo-launcher
+Keywords=game;adventure;multiplayer;online;emulator;monster;battle;mmo;mmorpg
+Terminal=false
+Type=Application
+Icon=pokemmo-launcher
+Categories=Game;AdventureGame;Emulator;RolePlaying;
diff --git a/pokemmo.install b/pokemmo.install
index a62815d9f62..51f7eb0265d 100644
--- a/pokemmo.install
+++ b/pokemmo.install
@@ -7,12 +7,13 @@ bold="${all_off}$(tput bold)"
blue="${bold}$(tput setaf 4)"
post_install(){
- msg_blue "To play, you will need to place a PokeMon Fire Red ROM, and optionally"
- msg_blue "a Heart Gold or Soul Silver ROM, in ~/.pokemmo/roms"
+ xdg-desktop-menu install --novendor --mode system /usr/share/applications/pokemmo.desktop
+ msg_blue "To play, you will need to place a Pokemon Black or White ROM, and optionally"
+ msg_blue "a FireRed, Emerald, and HeartGold or SoulSilver ROM, in ~/.pokemmo/roms"
echo ""
msg_blue "This software is not open-source. You must agree to the terms of service before"
msg_blue "using this software. The terms of service and licensing information may be"
- msg_blue "here: http://pokemmo.eu/tos/"
+ msg_blue "found here: https://pokemmo.eu/tos/"
}
post_upgrade() {
@@ -20,5 +21,6 @@ post_upgrade() {
}
post_remove() {
+ xdg-desktop-menu uninstall --novendor --mode system /usr/share/applications/pokemmo.desktop
msg_blue "You may remove leftover config and data files from '~/.pokemmo'."
}