From 4a76d7d2c46a02bd3d05c3f347bcd60c83ff5708 Mon Sep 17 00:00:00 2001
From: Eliza Velasquez <4576666+elizagamedev@users.noreply.github.com>
Date: Wed, 17 Jun 2020 19:11:11 -0700
Subject: [PATCH] Even more linux/itch fixes

---
 README.md                       |  24 ++++++++++++++++++++++-
 assets/journal.png              | Bin 0 -> 3191 bytes
 journal/unix/journal-linux.spec |  33 ++++++++++++++++++++++++++++++++
 make-appimage.sh                |  21 +++++++++++---------
 make-journal-linux.sh           |  33 ++++++++++++++++++++++++++++++++
 scripts/Persistent.rb           |   9 ++++++---
 scripts/Script.rb               |  30 ++++++++++++++++++-----------
 scripts/i18n_Language.rb        |   2 +-
 8 files changed, 127 insertions(+), 25 deletions(-)
 create mode 100644 assets/journal.png
 create mode 100644 journal/unix/journal-linux.spec
 create mode 100755 make-journal-linux.sh

diff --git a/README.md b/README.md
index 649e031..1a0f04a 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,29 @@ Finally, you can build the project by running the following:
 conan build ..
 ```
 
-On Ubuntu, you may now run `../make-appimage.sh .. . /path/to/game/files /some/path/OneShot.AppImage` to create an AppImage. Requires [linuxdeploy](https://github.com/linuxdeploy/linuxdeploy) and [AppImageTool](https://github.com/AppImage/AppImageKit) in your `PATH`.
+On Linux, you likely want to generate an AppImage. Please refer to how to build the Journal app below, as this is a prerequisite for building the AppImage. Afterwards, you may run the command, from the root directory of the repository:
+
+```sh
+./make-appimage.sh . build /path/to/game/files /path/to/journal/_______ /some/path/OneShot.AppImage`
+```
+
+Requires [linuxdeploy](https://github.com/linuxdeploy/linuxdeploy) and [AppImageTool](https://github.com/AppImage/AppImageKit) in your `PATH`.
+
+## Building the Journal app on Unix systems
+
+As a prerequisite on Ubuntu, ensure that the following packages are installed.
+
+```sh
+sudo apt install python3-venv libxcb-xinerama
+```
+
+Then run the script. From the root of the repository:
+
+```sh
+./make-journal-linux.sh . /path/to/journal/parent/directory/
+```
+
+This will generate a file called `_______`.
 
 ### Supported image/audio formats
 These depend on the SDL auxiliary libraries. *OneShot* only makes use of bmp/png for images and oggvorbis/wav for audio.
diff --git a/assets/journal.png b/assets/journal.png
new file mode 100644
index 0000000000000000000000000000000000000000..1059678c4bcb1e2c9910e87619d594af1d813c2c
GIT binary patch
literal 3191
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
WU@_q!{boKS1SG57mN&N@KKV}%`C1PE

literal 0
HcmV?d00001

diff --git a/journal/unix/journal-linux.spec b/journal/unix/journal-linux.spec
new file mode 100644
index 0000000..5e1123b
--- /dev/null
+++ b/journal/unix/journal-linux.spec
@@ -0,0 +1,33 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+block_cipher = None
+
+
+a = Analysis(['journal.py'],
+             pathex=['.'],
+             binaries=[],
+             datas=[('images', 'images'), ('qt.conf', '.')],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=['libgio-*', 'libglib-*', 'libsystemd.*', 'librt.*'],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          [],
+          name='_______',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=True )
diff --git a/make-appimage.sh b/make-appimage.sh
index f386eb8..51365a1 100755
--- a/make-appimage.sh
+++ b/make-appimage.sh
@@ -3,14 +3,17 @@
 LINUXDEPLOY=linuxdeploy-x86_64.AppImage
 APPIMAGETOOL=appimagetool-x86_64.AppImage
 
-if [ $# -lt 3 ]; then
-  echo "usage: linuxdeploy.sh SOURCE_PATH CONAN_INSTALL_PATH GAME_PATH APPIMAGE_FILE"
+if [ $# -lt 6 ]; then
+  echo "usage: make-appimage.sh SOURCE_PATH CONAN_INSTALL_PATH GAME_PATH EXTRA_UNIX_CONTENT_PATH JOURNAL_FILE APPIMAGE_FILE"
+  exit 1
 fi
 
 source_path="$1"
 conan_install_path="$2"
 game_path="$3"
-appimage_file="$4"
+unix_content_path="$4"
+journal_file="$5"
+appimage_file="$6"
 appdir="$(mktemp -d)"
 
 function atexit {
@@ -25,15 +28,15 @@ $LINUXDEPLOY -e "$conan_install_path/bin/oneshot" \
 	     -d "$source_path/assets/oneshot.desktop" \
 	     --appdir "$appdir"
 
-# Populate remaining AppImage spec files
-# ln -sf bin/oneshot "$appdir/AppRun"
-# cp -f "$source_path/assets/oneshot.png" "$appdir/oneshot.png"
-
 # Bundle game data
-for dir in Audio Data Fonts Graphics Languages Wallpaper; do
+cp -af "$journal_file" "$appdir/usr/bin/_______"
+cp -af "$source_path/assets/journal.png" "$appdir/usr/bin/_______.png"
+for dir in Audio Data Fonts Graphics Languages Wallpaper testing_saves testing_saves_postgame; do
   cp -ra "$game_path/$dir" "$appdir/usr/bin/"
+  [ -d "$unix_content_path/$dir/" ] && rsync -a "$unix_content_path/$dir/" "$appdir/usr/bin/$dir/"
 done
-cp -a "$conan_install_path/bin/Data/xScripts.rxdata" "$appdir/usr/bin/Data/"
+find "$appdir/usr/bin" \( -iname '*.bmp' -o -iname 'thumbs.db' -o -iname '*.ini' \) -delete
+cp -af "$conan_install_path/bin/Data/xScripts.rxdata" "$appdir/usr/bin/Data/"
 
 # Create AppImage
 ARCH=x86_64 $APPIMAGETOOL "$appdir" "$appimage_file"
diff --git a/make-journal-linux.sh b/make-journal-linux.sh
new file mode 100755
index 0000000..67ffeb3
--- /dev/null
+++ b/make-journal-linux.sh
@@ -0,0 +1,33 @@
+#!/bin/bash -eu
+
+if [ $# -lt 2 ]; then
+  echo "usage: make-journal-linux.sh SOURCE_PATH OUTPUT_DIR"
+  exit 1
+fi
+
+source_path="$1"
+output_dir="$2"
+venv="$(mktemp -d)"
+workpath="$(mktemp -d)"
+
+function atexit {
+  [ -n "$venv" ] && rm -rf "$venv"
+  [ -n "$workpath" ] && rm -rf "$workpath"
+}
+
+trap atexit EXIT
+
+# Create and initialize venv
+python3 -m venv "$venv"
+set +u
+source "$venv/bin/activate"
+set -u
+pip install --upgrade pip
+pip install pyqt5 pyinstaller
+
+# Create standalone python distribution
+pyinstaller --onefile \
+	    --distpath "$output_dir" \
+	    --workpath "$workpath" \
+	    --specpath="$source_path/journal/unix" \
+	    "$source_path/journal/unix/journal-linux.spec"
diff --git a/scripts/Persistent.rb b/scripts/Persistent.rb
index 11427cf..602cec8 100644
--- a/scripts/Persistent.rb
+++ b/scripts/Persistent.rb
@@ -24,9 +24,12 @@ class Persistent
 
   def initialize
     self.lang = LanguageCode.new(Steam::LANG || Oneshot::LANG)
-	if File.exists?("zh_CN.ver")
-	  self.lang = LanguageCode.new("zh_CN")
-	end
+    if File.exists?("zh_CN.ver")
+      self.lang = LanguageCode.new("zh_CN")
+    end
+    if not Steam.enabled? then
+      self.lang = LanguageCode.new("en")
+    end
   end
 
   # Members
diff --git a/scripts/Script.rb b/scripts/Script.rb
index f17df92..28e32ec 100644
--- a/scripts/Script.rb
+++ b/scripts/Script.rb
@@ -2,7 +2,8 @@ PROTO_TEXT = "put me in the big portal"
 CEDRIC_TEXT = "put me in the big portal"
 RUE_TEXT = "put me in the big portal"
 
-SUPPORTED_DE = ["cinnamon", "gnome", "mate", "kde", "xfce"]
+# Gnome 3 does not show desktop entries in Nautilus.
+SUPPORTED_DE = ["cinnamon", "mate", "kde", "xfce"]
 
 module Script
   def self.px
@@ -374,6 +375,17 @@ module Script
     $game_temp.bgm_fadein_speed = speed
   end
 
+  def self.copy_file_chmod(src, dest, chmod)
+    File.open(dest, 'wb') do |output|
+      File.open(src, 'rb') do |input|
+        while buff = input.read(4096)
+          output.write(buff)
+        end
+      end
+    end
+    File.chmod(chmod, dest)
+  end
+
   def self.copy_journal
     # If the required directories don't exist, create them
     Dir.mkdir(Oneshot::GAME_PATH) unless File.exists?(Oneshot::GAME_PATH)
@@ -382,26 +394,22 @@ module Script
       # If we're on a supported Linux DE, make a .desktop file
       # so the clover icon can be properly shown
       if Oneshot::OS == "linux" and SUPPORTED_DE.include? Oneshot::DE
+        copy_file_chmod("#{Dir.pwd}/#{Oneshot::JOURNAL}", "#{Oneshot::SAVE_PATH}/#{Oneshot::JOURNAL}", 0755)
+        copy_file_chmod("#{Dir.pwd}/#{Oneshot::JOURNAL}.png", "#{Oneshot::SAVE_PATH}/#{Oneshot::JOURNAL}.png", 0644)
         path = "#{Oneshot::GAME_PATH}/Oneshot/#{Oneshot::JOURNAL}.desktop"
         File.open(path, "wb") do |output|
           output.write("[Desktop Entry]\n")
           output.write("Comment=...\n")
           output.write("Terminal=false\n")
           output.write("Name=_______\n")
-          output.write("Exec=#{Dir.pwd}/#{Oneshot::JOURNAL}\n")
+          output.write("Exec=#{Oneshot::SAVE_PATH}/#{Oneshot::JOURNAL}\n")
           output.write("Type=Application\n")
-          output.write("Icon=#{Dir.pwd}/images/icon.png\n")
+          output.write("Icon=#{Oneshot::SAVE_PATH}/#{Oneshot::JOURNAL}.png\n")
         end
-        File.chmod(0777, path)
+        File.chmod(0755, path)
       # If the journal is a file, copy it to Documents
       elsif File.file?(Oneshot::JOURNAL)
-        File.open(Oneshot::JOURNAL, "rb") do |input|
-          File.open("#{Oneshot::GAME_PATH}/Oneshot/#{Oneshot::JOURNAL}", "wb") do |output|
-            while buff = input.read(4096)
-              output.write(buff)
-            end
-          end
-        end
+        copy_file_chmod(Oneshot::JOURNAL, "#{Oneshot::GAME_PATH}/Oneshot/#{Oneshot::JOURNAL}", 0755)
       # If the journal isn't a file, symlink it
       else
         File.symlink "#{Dir.pwd}/#{Oneshot::JOURNAL}", "#{Oneshot::GAME_PATH}/Oneshot/#{Oneshot::JOURNAL}"
diff --git a/scripts/i18n_Language.rb b/scripts/i18n_Language.rb
index ad83990..ced44d2 100644
--- a/scripts/i18n_Language.rb
+++ b/scripts/i18n_Language.rb
@@ -18,7 +18,7 @@ class Language
   LANG_CK = [
      'ko', 'zh_CN'
   ]
-  LANGUAGES = LANG_WESTERN + LANG_CK + LANG_J
+  LANGUAGES = Steam.enabled? ? (LANG_WESTERN + LANG_CK + LANG_J) : ['en']
 
   class << self
     def set(lc)