Window rule examples for use with kwin or devilspie2 added.

Evebackup messages are now more detailed.
Message about missing EVE configuration from check_wine to getval function moved.
Winetricks call in check_wine function removed.
Winetricks are now optional but highly recommended.

11 files changed, 92 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57037c0f90f2..a3d233bf9167 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1548102
-	pkgrel = 7
+	pkgrel = 8
 	url = https://forums.eveonline.com/t/eve-installing/71494
 	arch = x86_64
 	license = custom
@@ -17,8 +17,8 @@ pkgbase = evesetup
 	depends = qt5-webengine
 	depends = qt5-websockets
 	depends = wine
-	depends = winetricks
 	optdepends = libnotify
+	optdepends = winetricks
 	conflicts = evelauncher
 	conflicts = evesetup_dev
 	noextract = eve-transl5.11-de.tar.gz
@@ -41,6 +41,8 @@ pkgbase = evesetup
 	source = evebackup.desktop
 	source = evebackup
 	source = everestore.desktop
+	source = evelauncher.kwinrule
+	source = evelauncher.lua
 	source = build_installer.sh
 	source = build_small_installer.sh
 	source = setup.sh.in
@@ -59,19 +61,21 @@ pkgbase = evesetup
 	sha256sums = e9c2145865e425a13fa38f433f2aec0574c44950442dffb900ae41085bfe7566
 	sha256sums = b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8
 	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
-	sha256sums = d60152349595e64fa625844fc783f84734845d630c8d29819b0b357d978cbc85
+	sha256sums = 4eaceb0661dd38354c3738411bdbe48e29bab103bb09b8f959d16f1073904625
 	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
 	sha256sums = 9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653
 	sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd
 	sha256sums = c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24
-	sha256sums = f438c7002eaf8e1186a838ac2e803242b7a2c98a22cf49622eb4a64cf4b202ec
+	sha256sums = 1e4c0ccb1f1fd8baa7c85dce099e4796389a92c42d528fbc9a988a16a39edafd
 	sha256sums = 30b6440b842c19df64892cc560c274a7cc4f5de910a9f81e12dd0d76da561474
-	sha256sums = 5630ca5acb4762e8274c7d34f623ed2080cd3c3888f0c974f62aa963efd31c41
+	sha256sums = 9faa37aaf682e0951cc03120d4cc0b68d71f445752f34628e9bb906bdced0ec9
 	sha256sums = 261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8
-	sha256sums = 1e5260946bdfe552a1c6b576ea6618a7c9a91f66a9a63af095cf1f774c8c69da
-	sha256sums = f142bf1734f2516cee99656d14af529bdf4161cc798ed3f27b7f1a4a6ec0eb36
-	sha256sums = 1281229d7f53e6e505cf1a0b356e89982636a12dde79efca8a91ea7d0fa7ffaf
-	sha256sums = 6162de37dc2267b23452a962bd6a3541331c823dd570076d3c6018f943f2d75d
+	sha256sums = 528fc6627e8893db5d7092194e9f3320067f2f1f4593a206aee8a5207956e563
+	sha256sums = d4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2
+	sha256sums = c2a2397077286d0eb4341ad6aff1db89386dd4530861de769de531f31d071a8b
+	sha256sums = a68456ca5b7abb1741bea96e8d6a24d78d111f14388312446d7bd130f06dfce2
+	sha256sums = 424e72f83e84f985febe55eb4364f30a55ae75be20c9d3d639539009ce0fe15f
+	sha256sums = 10393631d8bcc1cb15bec7a24e9ad033a927fd8d466b23f3d5aea9ab8f567e21
 	sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3
 	sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422
 	sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a
diff --git a/PKGBUILD b/PKGBUILD
index 0efbb5192358..ec0ffd910f79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: Gharim Turen <gharim@turen.de>
 pkgname=evesetup
 pkgver=1548102
-pkgrel=7
+pkgrel=8
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 arch=(x86_64)
 url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -18,10 +18,9 @@ depends=('icu'
          'qt5-webchannel'
          'qt5-webengine'
          'qt5-websockets'
-         'wine'
-         'winetricks')
+         'wine')
 
-optdepends=('libnotify')
+optdepends=('libnotify' 'winetricks')
 
 conflicts=('evelauncher' 'evesetup_dev')
 
@@ -38,6 +37,8 @@ source=("evelauncher.desktop"
         "evebackup.desktop"
         "evebackup"
         "everestore.desktop"
+        "evelauncher.kwinrule"
+        "evelauncher.lua"
         "build_installer.sh"
         "build_small_installer.sh"
         "setup.sh.in"
@@ -64,6 +65,7 @@ noextract=('eve-transl5.11-de.tar.gz'
 package() {
         install -d "${pkgdir}/opt/${pkgname}/bin"
         install -d "${pkgdir}/opt/${pkgname}/lib"
+        install -d "${pkgdir}/opt/${pkgname}/doc"
         install -d "${pkgdir}/usr/bin"
         install -d "${pkgdir}/usr/share/applications"
         install -d "${pkgdir}/usr/share/icons"
@@ -89,6 +91,8 @@ package() {
             fi
         done
         cp ${srcdir}/evesetup.shlib ${pkgdir}/opt/${pkgname}/lib
+        cp ${srcdir}/evelauncher.lua ${pkgdir}/opt/${pkgname}/doc
+        cp ${srcdir}/evelauncher.kwinrule ${pkgdir}/opt/${pkgname}/doc
         cp -r ${srcdir}/icons ${pkgdir}/usr/share/
         rm -rf ${srcdir}/evelauncher/resources/ ${srcdir}/evelauncher/plugins/
         rm -f ${srcdir}/evelauncher/*[Qq]t* ${srcdir}/evelauncher/libcrypto*
@@ -115,19 +119,21 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
             'e9c2145865e425a13fa38f433f2aec0574c44950442dffb900ae41085bfe7566'
             'b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8'
             '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
-            'd60152349595e64fa625844fc783f84734845d630c8d29819b0b357d978cbc85'
+            '4eaceb0661dd38354c3738411bdbe48e29bab103bb09b8f959d16f1073904625'
             'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
             '9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653'
             '546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd'
             'c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24'
-            'f438c7002eaf8e1186a838ac2e803242b7a2c98a22cf49622eb4a64cf4b202ec'
+            '1e4c0ccb1f1fd8baa7c85dce099e4796389a92c42d528fbc9a988a16a39edafd'
             '30b6440b842c19df64892cc560c274a7cc4f5de910a9f81e12dd0d76da561474'
-            '5630ca5acb4762e8274c7d34f623ed2080cd3c3888f0c974f62aa963efd31c41'
+            '9faa37aaf682e0951cc03120d4cc0b68d71f445752f34628e9bb906bdced0ec9'
             '261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8'
-            '1e5260946bdfe552a1c6b576ea6618a7c9a91f66a9a63af095cf1f774c8c69da'
-            'f142bf1734f2516cee99656d14af529bdf4161cc798ed3f27b7f1a4a6ec0eb36'
-            '1281229d7f53e6e505cf1a0b356e89982636a12dde79efca8a91ea7d0fa7ffaf'
-            '6162de37dc2267b23452a962bd6a3541331c823dd570076d3c6018f943f2d75d'
+            '528fc6627e8893db5d7092194e9f3320067f2f1f4593a206aee8a5207956e563'
+            'd4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2'
+            'c2a2397077286d0eb4341ad6aff1db89386dd4530861de769de531f31d071a8b'
+            'a68456ca5b7abb1741bea96e8d6a24d78d111f14388312446d7bd130f06dfce2'
+            '424e72f83e84f985febe55eb4364f30a55ae75be20c9d3d639539009ce0fe15f'
+            '10393631d8bcc1cb15bec7a24e9ad033a927fd8d466b23f3d5aea9ab8f567e21'
             '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3'
             '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422'
             '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a'
diff --git a/build_installer.sh b/build_installer.sh
index f73fe07f82cd..aac86f16cd3a 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -65,7 +65,9 @@ for cmd in backup launcher.sh regedit restore wine winecfg winetricks ;do
     if [ -f ../$cmd ] ;then cp ../$cmd evesetup/ ;fi
     if [ ! "$cmd" = "evewine" ] ;then cp ../${cmd%.*}.desktop evesetup/ ;fi
 done
-cp ../evesetup.shlib evesetup/evesetup.shlib
+cp ../evesetup.shlib evesetup/
+cp ../evelauncher.kwinrule evesetup/
+cp ../evelauncher.lua evesetup/
 cp ../evelauncher.sh.in evesetup/evelauncher.sh
 sed -i s,ELVER=\"\",ELVER=\"$version\", evesetup/evelauncher.sh
 cp ../setup.sh.in evesetup/setup.sh
diff --git a/build_small_installer.sh b/build_small_installer.sh
index 84db520a455f..ef24193b3740 100755
--- a/build_small_installer.sh
+++ b/build_small_installer.sh
@@ -74,7 +74,9 @@ for cmd in backup launcher.sh regedit restore wine winecfg winetricks ;do
     if [ -f ../$cmd ] ;then cp ../$cmd evesetup/ ;fi
     if [ ! "$cmd" = "evewine" ] ;then cp ../${cmd%.*}.desktop evesetup/ ;fi
 done
-cp ../evesetup.shlib evesetup/evesetup.shlib
+cp ../evesetup.shlib evesetup/
+cp ../evelauncher.kwinrule evesetup/
+cp ../evelauncher.lua evesetup/
 cp ../evelauncher.sh evesetup/
 sed -i s,ELVER=\"\",ELVER=\"$version\", evesetup/evelauncher.sh
 cp ../setup_small.sh.in evesetup/setup.sh
diff --git a/evebackup b/evebackup
index b1a7904ce0f9..17efc06a3592 100644
--- a/evebackup
+++ b/evebackup
@@ -8,11 +8,13 @@ backup_settings() {
 for SERVER in tranquility singularity duality thunderdome ;do
     CLPROFILE="$(ls -d *_$SERVER 2>/dev/null || true)"
     [ "x$CLPROFILE" = "x" ] && continue
-    if [ ! -f "$BACKUPDIR/$SERVER-settings_current.7z" ] ;then
-	MSGSTR="Preparing backup for $SERVER, please run $CMDSTR again."
-    else
+    if [ -f "$BACKUPDIR/$SERVER-settings_current.7z" ] ;then
 	mv "$BACKUPDIR/$SERVER-settings_current.7z" "$BACKUPDIR/$SERVER-settings.7z"
-	MSGSTR="User settings in $BACKUPDIR saved."
+	SERVERLIST="$SERVERLIST $SERVER"
+	MSGSTR="Settings for$SERVERLIST in $BACKUPDIR stored."
+    else
+	MSGSTR="Preparing backup for $SERVER, please run $CMDSTR again."
+	desktop_msg "$MSGSTR"
     fi
     cd "$CLPROFILE"
     7z u -t7z -xr!Browser "$BACKUPDIR/$SERVER-settings.7z" \
@@ -34,7 +36,8 @@ for SERVER in thunderdome duality singularity tranquility ;do
     esac
     [ -d c_"$SERVER_SHORT"_"$SERVER" ] || mkdir c_"$SERVER_SHORT"_"$SERVER"
     7z x "$BACKUPDIR/$SERVER-settings.7z" -oc_"$SERVER_SHORT"_"$SERVER" -y >/dev/null
-    MSGSTR="User settings from $BACKUPDIR restored."
+    SERVERLIST="$SERVERLIST $SERVER"
+    MSGSTR="Settings for$SERVERLIST from $BACKUPDIR restored."
 done
 }
 
diff --git a/evelauncher.kwinrule b/evelauncher.kwinrule
new file mode 100644
index 000000000000..8bf31ede027e
--- /dev/null
+++ b/evelauncher.kwinrule
@@ -0,0 +1,18 @@
+[Rules for EVE Launcher]
+Description=Rules for EVE Launcher
+clientmachine=localhost
+clientmachinematch=0
+ignoregeometry=true
+ignoregeometryrule=3
+noborder=true
+noborderrule=3
+placement=Centered
+placementrule=2
+size=1280,720
+sizerule=3
+title=EVE Launcher - version
+titlematch=2
+types=1
+wmclass=evelauncher eve
+wmclasscomplete=true
+wmclassmatch=1
diff --git a/evelauncher.lua b/evelauncher.lua
new file mode 100644
index 000000000000..b79b5f87bbaa
--- /dev/null
+++ b/evelauncher.lua
@@ -0,0 +1,6 @@
+-- Devilspie2 Rules for EVE Launcher
+if (get_window_name() == "EVE Launcher - version 1548102") then
+    undecorate_window();
+    set_window_size(1280,720);
+    center();
+end
diff --git a/evesetup.shlib b/evesetup.shlib
index 8763d1b11b58..19198963822c 100644
--- a/evesetup.shlib
+++ b/evesetup.shlib
@@ -23,6 +23,10 @@ check_elv() {
 	    fi
 	    tar xf $SETUPDIR/lib/evelauncher-$ELVER.tar.?z -C $EVEDIR
 	    mv $EVEDIR/evelauncher $LAUNCHER
+	    if [ -f "$HOME/.config/devilspie2/evelauncher.lua" ] ;then
+		sed -i 2\ s,[0-9].*\",$ELVER\", \
+		    $HOME/.config/devilspie2/evelauncher.lua
+	    fi
 	fi
 }
 
@@ -56,10 +60,6 @@ check_steam() {
 }
 
 check_wine() {
-    if [ ! -r "$EVECONF" ] ;then
-	desktop_msg "ERROR: EVE Configuration not found!"
-	exit 1
-    fi
     CUSTOMWP=$(getval CustomWinePath)
     SHAREDIR=$(getval SharedCacheFolder)
     UCW=$(getval UseCustomWine)
@@ -89,14 +89,6 @@ check_wine() {
 	    $WINEPATH/wine reg add \
 	    'HKCU\Software\Wine\FileOpenAssociations' \
 	    /v Enable /d N /f >/dev/null
-	WINETRP=$(cat $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
-	if [ "x$WINETRP" != "x" ] ;then
-	    desktop_msg "Apply winetricks settings. This will take some time."
-	    rm $WINEPREFIX/winetricks.log >/dev/null
-	    env WINEPREFIX=$WINEPREFIX \
-		WINE=$WINEPATH/wine \
-		$(which winetricks) -q --force $WINETRP >/dev/null
-	fi
     fi
     if [ "x$(grep -csw winemenubuilder $WINEPREFIX/system.reg)" != "x0" ] ;then
 	if [ -x "$WINEPATH/wine64" ] ;then
@@ -124,5 +116,9 @@ getdate() {
 }
 
 getval() {
+    if [ ! -r "$EVECONF" ] ;then
+	desktop_msg "ERROR: EVE Configuration not found!"
+	exit 1
+    fi
     printf $(grep "$1" $EVECONF | cut -d= -f2)
 }
diff --git a/evewinetricks b/evewinetricks
index 29c209e26ebf..1180a599b97a 100644
--- a/evewinetricks
+++ b/evewinetricks
@@ -4,5 +4,12 @@
 
 check_wine
 
+WINETRICKs=$(which winetricks 2>/dev/null)
+
+if [ "x$WINETRICKS" = "x"  ] ;then
+    desktop_msg "winetricks not found!"
+    exit 1
+fi
+
 env WINEPREFIX=$WINEPREFIX \
-    WINE=$WINEPATH/wine $(which winetricks) "$@"
+    WINE=$WINEPATH/wine $WINETRICKS "$@"
diff --git a/setup.sh.in b/setup.sh.in
index 638cb1d436bc..f04ee968e4f0 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -6,6 +6,7 @@ bootstrap_install() {
     install -dv "$destdir"
     install -dv "$bindir"
     install -dv "$libdir"
+    install -dv "$docdir"
     install -d "$prefix/bin/"
     install -d "$prefix/share/applications/"
     for eta in ./eve-transl${qtver}-??.tar.gz ;do
@@ -13,6 +14,8 @@ bootstrap_install() {
     done
     install -m 0644 "./evesetup.shlib" "$libdir"
     install -m 0644 "./evelauncher-${elver}.tar.gz" "$libdir"
+    install -m 0644 "./evelauncher.kwinrule" "$docdir"
+    install -m 0644 "./evelauncher.lua" "$docdir"
     sed -i s,./eve-transl,$libdir/eve-transl, ./evelauncher.sh
     sed -i s,SETUPDIR=\"\",SETUPDIR=\"$destdir\", ./evelauncher.sh
     for cmd in backup launcher.sh regedit restore wine winecfg winetricks ;do
@@ -128,20 +131,13 @@ check_req() {
 	printf "\nLeaving.\n\n"
 	exit 0
     fi
-    if [ -x "$(which winetricks 2>/dev/null)" ] ;then
-	echo "Winetricks version $(winetricks --version | cut -d' ' -f1) found."
-    else
-	echo "Winetricks not found. Winetricks are required."
-	echo " Please install Winetricks with your Package Manager."
-	printf "\nLeaving.\n\n"
-	exit 0
-    fi
 }
 
 prefix="/usr"
 destdir="/opt/evesetup"
 bindir="$destdir/bin"
 libdir="$destdir/lib"
+docdir="$destdir/doc"
 qtver="5.11"
 elver=""
 elcsum=""
diff --git a/setup_small.sh.in b/setup_small.sh.in
index e95a94871c5e..cdec844abc40 100644
--- a/setup_small.sh.in
+++ b/setup_small.sh.in
@@ -6,10 +6,13 @@ bootstrap_install() {
     install -dv "$destdir"
     install -dv "$bindir"
     install -dv "$libdir"
+    install -dv "$docdir"
     install -d "$prefix/bin/"
     install -d "$prefix/share/applications/"
     install -pm 0644 "./evesetup.shlib" "$libdir"
     install -pm 0644 "./evelauncher-${elver}.tar.gz" "$libdir"
+    install -m 0644 "./evelauncher.kwinrule" "$docdir"
+    install -m 0644 "./evelauncher.lua" "$docdir"
     sed -i s,SETUPDIR=\"\",SETUPDIR=\"$destdir\", ./evelauncher.sh
     for cmd in backup launcher.sh regedit restore wine winecfg winetricks ;do
 	cmd=eve$cmd
@@ -62,9 +65,6 @@ check_req() {
     if [ ! -x "$(which wine 2>/dev/null)" ] ;then
 	req="${req}wine\n"
     fi
-    if [ ! -x "$(which winetricks 2>/dev/null)" ] ;then
-	req="${req}winetricks\n"
-    fi
     tar xf evelauncher-$elver.tar.gz
     cd evelauncher/
     req="${req}$(LD_LIBRARY_PATH=$(pwd) ldd ./evelauncher | grep -i not | sed s,\\t,, | cut -d' ' -f1)"
@@ -83,6 +83,7 @@ prefix="/usr"
 destdir="/opt/evesetup"
 bindir="$destdir/bin"
 libdir="$destdir/lib"
+docdir="$destdir/doc"
 elver=""
 key=""