summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD17
-rwxr-xr-xbuild_installer.sh1
-rw-r--r--evelauncher.sh86
-rw-r--r--evelauncher.sh.in89
-rw-r--r--evelauncher.shlib28
-rw-r--r--evewine19
-rw-r--r--evewinetricks18
-rw-r--r--setup.sh.in1
9 files changed, 126 insertions, 149 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f90e469307a8..335cebc42b02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = evesetup
pkgdesc = An inofficial EVE Online Launcher Setup Tool.
pkgver = 1456645
- pkgrel = 3
+ pkgrel = 4
url = https://forums.eveonline.com/t/eve-installing/71494
arch = x86_64
license = custom
@@ -31,6 +31,7 @@ pkgbase = evesetup
source = evelauncher.sh
source = evelauncher.sh.in
source = evelauncher.sh.real
+ source = evelauncher.shlib
source = everegedit.desktop
source = evewine
source = evewinecfg.desktop
@@ -50,17 +51,18 @@ pkgbase = evesetup
source = https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run
source = https://binaries.eveonline.com/evelauncher-1456645.tar.gz
sha256sums = f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731
- sha256sums = 543ca32d8fb129addb6aef9c7c123c54a9565b6a0cc69e17814400eb1346280b
- sha256sums = ed0e64da5030285f80371bfe8006fd21cd4a2f2060cf162756c2ab9a66f5497f
+ sha256sums = 11bae38d4ac7949a179c9aef41149ee8fd252f1d9d6ede052acecc32925b78fd
+ sha256sums = 8f1619267798081175981b30780adef839ad30997c8655bbf8542dd48ac7369b
sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
+ sha256sums = a30ffa8b8be5e589ea17446f09d69bbc18d8d9abe65e3f826062642be1de1000
sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c
- sha256sums = d0225e14dd3f619bf6540df134b5545e13bfb0954616a329c48d5eb768862eda
+ sha256sums = c34173892d77a887b909dcca93fc963799f7b6815768822d3b59ccabf619c485
sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2
sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce
- sha256sums = efac7e7f31af0020f35aa026c6231fbf8dd56124832b8d60c3fcde126ca24cab
+ sha256sums = 353e627e66cf8e738507e68269c0608dd7bb69c40d5558155bbf940bc147a8b2
sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d
- sha256sums = d2396e827bb573ba23611ed0d1668e0af86d4105bed8af5ffb43646b0f42958b
- sha256sums = e4cca477a1ca74398f7a0489f4db398fd9dd6874d464e046b1fdeea5a2b50686
+ sha256sums = c6cd9fc7b02815d386e5ca15ef2c39abb0588c904a071f876629a4833cfde22f
+ sha256sums = ca0b2d07e30bc131b7dabb1d01ce9e7ad08769eec8a04531593d23f67593e43f
sha256sums = 2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28
sha256sums = f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2
sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a
diff --git a/PKGBUILD b/PKGBUILD
index 5fbd8ded29b2..626910ee00b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
#Maintainer: Gharim Turen <gharim@turen.de>
pkgname=evesetup
pkgver=1456645
-pkgrel=3
+pkgrel=4
pkgdesc="An inofficial EVE Online Launcher Setup Tool."
arch=(x86_64)
url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -29,6 +29,7 @@ source=("evelauncher.desktop"
"evelauncher.sh"
"evelauncher.sh.in"
"evelauncher.sh.real"
+ "evelauncher.shlib"
"everegedit.desktop"
"evewine"
"evewinecfg.desktop"
@@ -98,22 +99,24 @@ package() {
tar cJf ${srcdir}/launcher-${pkgver}.tar.xz Launcher/
install -d "${pkgdir}/opt/${pkgname}/lib"
mv ${srcdir}/launcher-${pkgver}.tar.xz ${pkgdir}/opt/${pkgname}/lib
+ cp ${srcdir}/evelauncher.shlib ${pkgdir}/opt/${pkgname}/lib
install -d ${pkgdir}/usr/share/icons
cp -r ${srcdir}/icons ${pkgdir}/usr/share/
}
sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731'
- '543ca32d8fb129addb6aef9c7c123c54a9565b6a0cc69e17814400eb1346280b'
- 'ed0e64da5030285f80371bfe8006fd21cd4a2f2060cf162756c2ab9a66f5497f'
+ '11bae38d4ac7949a179c9aef41149ee8fd252f1d9d6ede052acecc32925b78fd'
+ '8f1619267798081175981b30780adef839ad30997c8655bbf8542dd48ac7369b'
'80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
+ 'a30ffa8b8be5e589ea17446f09d69bbc18d8d9abe65e3f826062642be1de1000'
'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c'
- 'd0225e14dd3f619bf6540df134b5545e13bfb0954616a329c48d5eb768862eda'
+ 'c34173892d77a887b909dcca93fc963799f7b6815768822d3b59ccabf619c485'
'04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2'
'22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce'
- 'efac7e7f31af0020f35aa026c6231fbf8dd56124832b8d60c3fcde126ca24cab'
+ '353e627e66cf8e738507e68269c0608dd7bb69c40d5558155bbf940bc147a8b2'
'2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d'
- 'd2396e827bb573ba23611ed0d1668e0af86d4105bed8af5ffb43646b0f42958b'
- 'e4cca477a1ca74398f7a0489f4db398fd9dd6874d464e046b1fdeea5a2b50686'
+ 'c6cd9fc7b02815d386e5ca15ef2c39abb0588c904a071f876629a4833cfde22f'
+ 'ca0b2d07e30bc131b7dabb1d01ce9e7ad08769eec8a04531593d23f67593e43f'
'2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28'
'f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2'
'47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a'
diff --git a/build_installer.sh b/build_installer.sh
index f697e0af123d..b0ee5aa819f8 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -40,6 +40,7 @@ for cmd in evelauncher.sh everegedit evewine evewinecfg evewinetricks ;do
cp ../${cmd%.*}.desktop evesetup/
fi
done
+cp -f ../evelauncher.shlib evesetup/evelauncher.shlib
cp -f ../evelauncher.sh.in evesetup/evelauncher.sh
grep -v '^#-' ../setup.sh.in >evesetup/setup.sh
chmod a+x evesetup/setup.sh
diff --git a/evelauncher.sh b/evelauncher.sh
index b5a4f5f386d3..7826429249a7 100644
--- a/evelauncher.sh
+++ b/evelauncher.sh
@@ -2,14 +2,7 @@
set -e
-launcher_msg() {
- if [ -x "$(which notify-send 2>/dev/null)" ] ;then
- notify-send -i eve 'EVE Online Launcher' "$@"
- fi
- echo "$(basename $0): $@"
-}
-
-check_install() {
+check_env() {
if [ -d "$CONFDIR" ] ;then
if [ -r "$CONFDIR/EVE.conf" ] ;then
SHAREDIR=$(grep SharedCacheFolder $CONFDIR/EVE.conf | cut -d= -f2)
@@ -18,7 +11,7 @@ check_install() {
SHAREDIR=${SHAREDIR:-$HOME/.eve/}
[ ! -d "$SHAREDIR" ] && SHAREDIR=""
if [ "x$SHAREDIR" != "x$EVEDIR/SharedCache/" ] ;then
- launcher_msg "Please wait, preparing environment in $EVEDIR"
+ desktop_msg "Please wait, preparing environment in $EVEDIR"
mkdir -p $CONFDIR
echo "[General]" >$CONFDIR/EVE.conf
echo "SharedCacheFolder=$EVEDIR/SharedCache/" >>$CONFDIR/EVE.conf
@@ -41,49 +34,38 @@ check_steam() {
}
check_wine() {
- EVECONF=$CONFDIR/EVE.conf
- UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2)
- if [ "x$UCW" = "xtrue" ] ;then
- CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2)
- WINEPATH=${CUSTOMWP%/*}
- SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2)
- WINEPREFIX=${SHAREDIR}wineenv
- else
- launcher_msg "ERROR: \"Use custom Wine\" not set!"
- exit 1
- fi
- if [ -x "$WINEPATH/wine" ] ;then
- INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true
- WINEINFP=$(readlink -f $CUSTOMWP)
- WINECONF=$(find ${WINEINFP%/bin*}/share -name 'wine.inf' 2>/dev/null) || true
- WINEDATE=$(ls -l --time-style=+%s "$WINECONF" 2>/dev/null | cut -d' ' -f6)
- if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
- launcher_msg "Preparing wine in $WINEPREFIX"
- env WINEARCH=win32 \
- WINEPREFIX=$WINEPREFIX \
- WINEDEBUG=-all \
- WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \
- $WINEPATH/wine wineboot
- env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \
- 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \
- /v winemenubuilder /f >/dev/null || true
+
+ check_custom_wine
+
+ INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true
+ WINEINFP=$(readlink -f $CUSTOMWP)
+ WINECONF=$(find ${WINEINFP%/bin*}/share -name 'wine.inf' 2>/dev/null) || true
+ WINEDATE=$(ls -l --time-style=+%s "$WINECONF" 2>/dev/null | cut -d' ' -f6)
+ if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
+ desktop_msg "Preparing wine in $WINEPREFIX"
+ env WINEPREFIX=$WINEPREFIX \
+ WINEDEBUG=-all \
+ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \
+ $WINEPATH/wine wineboot
+ env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \
+ 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \
+ /v winemenubuilder /f >/dev/null || true
env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
- 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
- /v winemenubuilder.exe /f >/dev/null
- WINETRP=$(grep -v winxp $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
- if [ "x$WINETRP" != "x" ] ;then
- rm $WINEPREFIX/winetricks.log
- env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
- $(which winetricks) -q --force $WINETRP >/dev/null
- fi
- if [ "x$($WINEPATH/wine --version | grep -q 4. ;echo $?)" != "x0" ] ;then
- env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
- $(which winetricks) -q winxp >/dev/null
- fi
+ 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
+ /v winemenubuilder.exe /f >/dev/null
+ WINETRP=$(grep -v win[x1..9] $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
+ if [ "x$WINETRP" != "x" ] ;then
+ rm $WINEPREFIX/winetricks.log
+ env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+ $(which winetricks) -q --force $WINETRP >/dev/null
fi
- else
- launcher_msg "ERROR: \"$CUSTOMWP\" in \"Custom Wine path\" not found!"
- exit 1
+ if [ "x$($WINEPATH/wine --version | grep -q 4. ;echo $?)" != "x0" ] ;then
+ WINVER=winxp
+ else
+ WINVER=win10
+ fi
+ env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+ $(which winetricks) -q --force $WINVER >/dev/null
fi
}
@@ -96,7 +78,9 @@ LAUNCHER="$EVEDIR/Launcher"
SETUPDIR="/opt/evesetup"
WINEPATH="/usr/bin"
-check_install
+source $SETUPDIR/lib/evelauncher.shlib
+
+check_env
check_wine
check_steam
diff --git a/evelauncher.sh.in b/evelauncher.sh.in
index 175bc1c58e4f..3d7ee5321a38 100644
--- a/evelauncher.sh.in
+++ b/evelauncher.sh.in
@@ -2,14 +2,7 @@
set -e
-launcher_msg() {
- if [ -x "$(which notify-send 2>/dev/null)" ] ;then
- notify-send -i eve 'EVE Online Launcher' "$@"
- fi
- echo "$(basename $0): $@"
-}
-
-check_install() {
+check_env() {
if [ -d "$CONFDIR" ] ;then
if [ -r "$CONFDIR/EVE.conf" ] ;then
SHAREDIR=$(grep SharedCacheFolder $CONFDIR/EVE.conf | cut -d= -f2)
@@ -18,15 +11,14 @@ check_install() {
SHAREDIR=${SHAREDIR:-$HOME/.eve/}
[ ! -d "$SHAREDIR" ] && SHAREDIR=""
if [ "x$SHAREDIR" != "x$EVEDIR/SharedCache/" ] ;then
- launcher_msg "Please wait, preparing environment in $EVEDIR"
+ desktop_msg "Please wait, preparing environment in $EVEDIR"
mkdir -p $CONFDIR
echo "[General]" >$CONFDIR/EVE.conf
echo "SharedCacheFolder=$EVEDIR/SharedCache/" >>$CONFDIR/EVE.conf
echo "UseCustomWine=true" >>$CONFDIR/EVE.conf
echo "CustomWinePath=$WINEPATH/wine" >>$CONFDIR/EVE.conf
mkdir -p $EVEDIR/SharedCache
- tar xf $SETUPDIR/lib/evelauncher-$ELVER.tar.gz -C $EVEDIR
- mv $EVEDIR/evelauncher/ $LAUNCHER/
+ tar xf $SETUPDIR/lib/launcher-$ELVER.tar.xz -C $EVEDIR
if [ -d "$SHAREDIR/ResFiles/" ] ;then
mv $SHAREDIR/ResFiles/ $EVEDIR/SharedCache/
mv $SHAREDIR/*.txt $EVEDIR/SharedCache/
@@ -52,49 +44,38 @@ check_steam() {
}
check_wine() {
- EVECONF=$CONFDIR/EVE.conf
- UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2)
- if [ "x$UCW" = "xtrue" ] ;then
- CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2)
- WINEPATH=${CUSTOMWP%/*}
- SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2)
- WINEPREFIX=${SHAREDIR}wineenv
- else
- launcher_msg "ERROR: \"Use custom Wine\" not set!"
- exit 1
- fi
- if [ -x "$WINEPATH/wine" ] ;then
- INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true
- WINEINFP=$(readlink -f $CUSTOMWP)
- WINECONF=$(find ${WINEINFP%/bin*}/share -name 'wine.inf' 2>/dev/null) || true
- WINEDATE=$(ls -l --time-style=+%s $WINECONF 2>/dev/null | cut -d' ' -f6)
- if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
- launcher_msg "Preparing wine in $WINEPREFIX"
- env WINEARCH=win32 \
- WINEPREFIX=$WINEPREFIX \
- WINEDEBUG=-all \
- WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \
- $WINEPATH/wine wineboot
- env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \
- 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \
- /v winemenubuilder /f >/dev/null || true
+
+ check_custom_wine
+
+ INSTWINE=$(cat $WINEPREFIX/.update-timestamp 2>/dev/null) || true
+ WINEINFP=$(readlink -f $CUSTOMWP)
+ WINECONF=$(find ${WINEINFP%/bin*}/share -name 'wine.inf' 2>/dev/null) || true
+ WINEDATE=$(ls -l --time-style=+%s "$WINECONF" 2>/dev/null | cut -d' ' -f6)
+ if [ "x$WINEDATE" != "x$INSTWINE" ] ;then
+ desktop_msg "Preparing wine in $WINEPREFIX"
+ env WINEPREFIX=$WINEPREFIX \
+ WINEDEBUG=-all \
+ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \
+ $WINEPATH/wine wineboot
+ env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg delete \
+ 'HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunServices' \
+ /v winemenubuilder /f >/dev/null || true
env WINEPREFIX=$WINEPREFIX $WINEPATH/wine reg add \
- 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
- /v winemenubuilder.exe /f >/dev/null
- WINETRP=$(grep -v winxp $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
- if [ "x$WINETRP" != "x" ] ;then
- rm $WINEPREFIX/winetricks.log
- env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
- $(which winetricks) -q --force $WINETRP >/dev/null
- fi
- if [ "x$($WINEPATH/wine --version | grep -q 4. ;echo $?)" != "x0" ] ;then
- env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
- $(which winetricks) -q --force winxp >/dev/null
- fi
+ 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' \
+ /v winemenubuilder.exe /f >/dev/null
+ WINETRP=$(grep -v win[x1..9] $WINEPREFIX/winetricks.log 2>/dev/null | uniq)
+ if [ "x$WINETRP" != "x" ] ;then
+ rm $WINEPREFIX/winetricks.log
+ env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+ $(which winetricks) -q --force $WINETRP >/dev/null
fi
- else
- launcher_msg "ERROR: \"$CUSTOMWP\" in \"Custom Wine path\" not found!"
- exit 1
+ if [ "x$($WINEPATH/wine --version | grep -q 4. ;echo $?)" != "x0" ] ;then
+ WINVER=winxp
+ else
+ WINVER=win10
+ fi
+ env WINEPREFIX=$WINEPREFIX WINE=$WINEPATH/wine \
+ $(which winetricks) -q --force $WINVER >/dev/null
fi
}
@@ -107,7 +88,9 @@ LAUNCHER="$EVEDIR/Launcher"
SETUPDIR="/opt/evesetup"
WINEPATH="/usr/bin"
-check_install
+source $SETUPDIR/lib/evelauncher.shlib
+
+check_env
check_transl
check_wine
check_steam
diff --git a/evelauncher.shlib b/evelauncher.shlib
new file mode 100644
index 000000000000..54c3d4062b7e
--- /dev/null
+++ b/evelauncher.shlib
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Evelauncher shared functions
+
+desktop_msg() {
+ if [ -x "$(which notify-send 2>/dev/null)" ] ;then
+ notify-send -i eve 'EVE Online Launcher' "$@"
+ fi
+ echo "$(basename $0): $@"
+}
+
+check_custom_wine() {
+ EVECONF=$HOME/.config/CCP/EVE.conf
+ UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2)
+ if [ "x$UCW" = "xtrue" ] ;then
+ CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2)
+ WINEPATH=${CUSTOMWP%/*}
+ SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2)
+ WINEPREFIX=${SHAREDIR}wineenv
+ else
+ desktop_msg "ERROR: \"Use custom Wine\" not set!"
+ exit 1
+ fi
+ if [ ! -x "$WINEPATH/wine" ] ;then
+ desktop_msg "ERROR: \"$CUSTOMWP\" from \"Custom Wine path\" not found!"
+ exit 1
+ fi
+}
diff --git a/evewine b/evewine
index 77b47f06580a..6d0c1fd9e4cb 100644
--- a/evewine
+++ b/evewine
@@ -1,21 +1,8 @@
#!/bin/sh
-EVECONF=$HOME/.config/CCP/EVE.conf
-UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2)
-if [ "x$UCW" = "xtrue" ] ;then
- CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2)
- WINEPATH=${CUSTOMWP%/*}
- SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2)
- WINEPREFIX=${SHAREDIR}wineenv
-else
- echo "$(basename $0): ERROR: \"Use Custom Wine\" not set!"
- exit 1
-fi
-if [ ! -x "$WINEPATH/wine" ] ;then
- echo "$(basename $0): ERROR: \"$CUSTOMWP\" from \"Custom Wine path\" not found!"
- echo "$(basename $0): The full path are required (example: /usr/bin/wine)."
- exit 1
-fi
+source /opt/evesetup/lib/evelauncher.shlib
+
+check_custom_wine
if [ -x "$WINEPATH/${0#*eve}" ] ;then
WINECMD=$WINEPATH/${0#*eve}
diff --git a/evewinetricks b/evewinetricks
index 6a6141e67b08..cb948ca54d82 100644
--- a/evewinetricks
+++ b/evewinetricks
@@ -1,20 +1,8 @@
#!/bin/sh
-EVECONF=$HOME/.config/CCP/EVE.conf
-UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2)
-if [ "x$UCW" = "xtrue" ] ;then
- CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2)
- WINEPATH=${CUSTOMWP%/*}
- SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2)
- WINEPREFIX=${SHAREDIR}wineenv
-else
- echo "$(basename $0): ERROR: \"Use Custom Wine\" not set!"
- exit 1
-fi
-if [ ! -x "$WINEPATH/wine" ] ;then
- echo "$(basename $0): ERROR: \"$CUSTOMWP\" in \"Custom Wine path\" not found!"
- exit 1
-fi
+source /opt/evesetup/lib/evelauncher.shlib
+
+check_custom_wine
env WINEPREFIX=$WINEPREFIX \
WINE=$WINEPATH/wine $(which winetricks) "$@"
diff --git a/setup.sh.in b/setup.sh.in
index 8667dcc78ae6..5ed16d86ce3c 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -44,6 +44,7 @@ bootstrap_install() {
for eta in $(ls ./eve-transl${qtver}-??.tar.gz) ;do
install -m 0644 "$eta" "${target}/lib"
done
+ install -m 0644 "./evelauncher.shlib" "${target}/lib"
install -m 0644 "./evelauncher-${elver}.tar.gz" "${target}/lib"
for icons in $(find . -type f -name '*.png') ;do
install -D -m 0644 "$icons" "${prefix}/share/${icons#*/}"