patch rename, add log fix patch

set log path on linux (no snap):
see: https://gitlab.e.foundation/e/tools/easy-installer/-/merge_requests/87

Signed-off-by: steadfasterX <steadfasterX@gmail.com>

4 files changed, 24 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b47cd51dd8ca..168d2e6e13bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = easy-installer
-	pkgdesc = The Easy Installer is a desktop application which helps users install /e/ (https://doc.e.foundation/what-s-e) on supported devices.
+	pkgdesc = The Easy Installer is a desktop application which helps users install Android /e/ (https://doc.e.foundation/what-s-e) on supported devices.
 	pkgver = 0.11.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://gitlab.e.foundation/e/tools/easy-installer
 	arch = x86_64
 	license = GPL3
@@ -11,11 +11,13 @@ pkgbase = easy-installer
 	makedepends = java-runtime-common
 	makedepends = ruby-ronn
 	source = easy-installer-0.11.1::git+https://gitlab.e.foundation/e/tools/easy-installer.git#tag=v0.11.1-beta
-	source = easy-installer-0.11.1.patch
+	source = easy-installer-0.11.1_fixbuild.patch
+	source = easy-installer-0.11.1_fixlog.patch
 	source = easy-installer.8.md
 	md5sums = SKIP
 	md5sums = d6b12a412e1cbeba347727a84851c8d8
-	md5sums = 031b322072728ebc26542006cb0ba0b0
+	md5sums = c6abbaa5cc677ae827317451682dafd5
+	md5sums = bc6e92b53daabcee25e57904b3eb1bb6
 
 pkgname = easy-installer
 
diff --git a/PKGBUILD b/PKGBUILD
index 9ccf4bc15ccf..85b6093e1c9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,10 +13,12 @@ makedepends=('git' 'gradle' "java-environment-openjdk=${_reqjava}" 'java-runtime
 optdepends=()
 backup=()
 source=("${pkgname}-${pkgver}::git+https://gitlab.e.foundation/e/tools/${pkgname}.git#tag=v${pkgver}-beta"
-        "$pkgname-$pkgver.patch"
+        "${pkgname}-${pkgver}_fixbuild.patch"
+        "${pkgname}-${pkgver}_fixlog.patch"
         "${pkgname}.8.md")
 md5sums=('SKIP'
          'd6b12a412e1cbeba347727a84851c8d8'
+         'c6abbaa5cc677ae827317451682dafd5'
          'bc6e92b53daabcee25e57904b3eb1bb6')
 BINFIX=usr/local/bin
 MANDIR=usr/share/man
@@ -25,8 +27,10 @@ MAN8PAGE=${pkgname}.8
 
 prepare(){
     cd "$pkgname-$pkgver"
-    patch -p1 < "$srcdir/$pkgname-$pkgver.patch"
+    patch -p1 < "$srcdir/${pkgname}-${pkgver}_fixbuild.patch"
+    patch -p1 < "$srcdir/${pkgname}-${pkgver}_fixlog.patch"
 }
+
 build(){
     cd "$pkgname-$pkgver"
     export LC_ALL=C
diff --git a/easy-installer-0.11.1.patch b/easy-installer-0.11.1_fixbuild.patch
index a524f1cad142..a524f1cad142 100644
--- a/easy-installer-0.11.1.patch
+++ b/easy-installer-0.11.1_fixbuild.patch
diff --git a/easy-installer-0.11.1_fixlog.patch b/easy-installer-0.11.1_fixlog.patch
new file mode 100644
index 000000000000..fac73244fb81
--- /dev/null
+++ b/easy-installer-0.11.1_fixlog.patch
@@ -0,0 +1,12 @@
+diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java
+index 207c177..bc68a05 100644
+--- a/src/main/java/ecorp/easy/installer/AppConstants.java
++++ b/src/main/java/ecorp/easy/installer/AppConstants.java
+@@ -197,6 +197,8 @@ public abstract class AppConstants {
+             return  System.getenv("SNAP_USER_COMMON")+Separator;
+         }else if(isWindowsOs()){
+             return System.getenv("localappdata")+Separator+"easy-installer"+Separator;
++        }else if(isLinuxOs()){
++            return "/tmp/easy-installer"+Separator;
+         }else
+             return getRootPath();