From 8854cafc966f8041033a94a7c57800ced91559ae Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 27 Nov 2019 21:03:14 +0200
Subject: [PATCH] Added linux files for jar

---
 .travis.yml                            |  2 ++
 desktop/build.gradle                   |  8 ++++-
 desktop/linuxFilesForJar/Unciv.sh      | 46 ++++++++++++++++++++++++++
 desktop/linuxFilesForJar/unciv.desktop | 12 +++++++
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 desktop/linuxFilesForJar/Unciv.sh
 create mode 100644 desktop/linuxFilesForJar/unciv.desktop

diff --git a/.travis.yml b/.travis.yml
index d9fdffd810..dab863c195 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ script:
     ./gradlew desktop:packrWindows64;
     ./gradlew desktop:packrLinux32;
     ./gradlew desktop:packrLinux64;
+    ./gradlew desktop:zipLinuxFilesForJar;
   fi
     
 deploy:
@@ -48,6 +49,7 @@ deploy:
     - deploy/Unciv-Linux64.zip
     - deploy/Unciv-Windows32.zip
     - deploy/Unciv-Windows64.zip
+    - deploy/linuxFilesForJar.zip
   on:
     repo: yairm210/Unciv
     tags: true
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 136f47b084..2440114d1c 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -9,6 +9,7 @@ sourceSets.main.java.srcDirs = [ "src/" ]
 project.ext.mainClassName = "com.unciv.app.desktop.DesktopLauncher"
 project.ext.assetsDir = file("../android/assets")
 project.ext.discordDir = file("discord_rpc")
+def deployFolder = file("../deploy")
 
 task run(dependsOn: classes, type: JavaExec) {
     main = project.mainClassName
@@ -77,7 +78,6 @@ for(platform in PackrConfig.Platform.values()) {
         }
 
         task "zip${platformName}"(type: Zip) {
-            def deployFolder = file("../deploy")
             archiveFileName = "${appName}-${platformName}.zip"
             from config.outDir
             destinationDirectory = deployFolder
@@ -87,6 +87,12 @@ for(platform in PackrConfig.Platform.values()) {
     }
 }
 
+task zipLinuxFilesForJar(type: Zip) {
+    archiveFileName = "linuxFilesForJar.zip"
+    from file("linuxFilesForJar")
+    destinationDirectory = deployFolder
+}
+
 task packr(){
     for(platform in PackrConfig.Platform.values())
         finalizedBy "packr${platform.toString()}"
diff --git a/desktop/linuxFilesForJar/Unciv.sh b/desktop/linuxFilesForJar/Unciv.sh
new file mode 100644
index 0000000000..7e2d95ca5e
--- /dev/null
+++ b/desktop/linuxFilesForJar/Unciv.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+CONFIG_DIR="$HOME/.local/share/Unciv"
+
+USAGE="Unciv [--help | -h | --config-dir PATH]
+
+Run the Unciv game.
+
+With '--help' or '-h', show this help info and exit.
+
+With '--config-dir PATH', use/make configuration files in PATH instead
+of the default of '$CONFIG_DIR'.
+
+"
+
+usage() {
+    echo "$USAGE"
+    exit 0
+}
+
+fail() {
+    echo "Error: $1"
+    usage
+    exit 1
+}
+
+if [ "$#" -gt "0" ]; then
+    case "$1" in
+        --help|-h)
+            shift
+            usage
+            ;;
+        --config-dir)
+            CONFIG_DIR="$2"
+            shift 2
+            ;;
+    esac
+    shift
+fi
+if ! [ "$#" -eq "0" ]; then
+    fail "Unknown argument(s): $*"
+fi
+
+mkdir -p "$CONFIG_DIR"
+cd "$CONFIG_DIR" || fail "Could not 'cd' to '$CONFIG_DIR'"
+java -jar /usr/share/Unciv/Unciv.jar
diff --git a/desktop/linuxFilesForJar/unciv.desktop b/desktop/linuxFilesForJar/unciv.desktop
new file mode 100644
index 0000000000..77bf6570a3
--- /dev/null
+++ b/desktop/linuxFilesForJar/unciv.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=Open-source Android/Desktop remake of Civ V
+Exec=Unciv
+GenericName=4X Game
+Icon=unciv
+Name=Unciv
+NoDisplay=false
+StartupNotify=true
+Terminal=0
+Type=Application
+Categories=Game