summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD14
-rwxr-xr-xbuild_installer.sh4
-rwxr-xr-xbuild_small_installer.sh6
-rw-r--r--evebackup3
-rw-r--r--evesetup.shlib8
-rw-r--r--setup.sh.in12
-rw-r--r--setup_small.sh.in4
8 files changed, 33 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 427f4a57c1dc..668ae67582ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = evesetup
pkgdesc = An inofficial EVE Online Launcher Setup Tool.
pkgver = 1548102
- pkgrel = 5
+ pkgrel = 6
url = https://forums.eveonline.com/t/eve-installing/71494
arch = x86_64
license = custom
@@ -57,18 +57,18 @@ pkgbase = evesetup
sha256sums = e9c2145865e425a13fa38f433f2aec0574c44950442dffb900ae41085bfe7566
sha256sums = b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8
sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
- sha256sums = fb01952face95a91f6ab4590e6be9b460b08779766078698a7bcf7c57a5d34e4
+ sha256sums = d60152349595e64fa625844fc783f84734845d630c8d29819b0b357d978cbc85
sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
sha256sums = 9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653
sha256sums = 546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd
sha256sums = c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24
sha256sums = f438c7002eaf8e1186a838ac2e803242b7a2c98a22cf49622eb4a64cf4b202ec
sha256sums = 04c102d6db1bb8d4159c41f32ec0aa95846c0fb519841a3c1428ab20c850e9cf
- sha256sums = 25c84d6823badf7c04dd316857b144b614a917943baeb8dc769b27cd029071ff
- sha256sums = 5aff377c2158ff40eb7b27f3792cc568c41a43bdbff2787178ab936fff192c8d
- sha256sums = 7064241dd0b9876743ce89d0b638c9b2dc5e8153a327e44973a0424e31a715c1
- sha256sums = 6f8116cbbe05808be4ecddcb782965fcbfad09645ad8153db325e8c17ef7c27b
- sha256sums = dcb776b66f31a9f2fd545a5c6b6ef874b3f9b3c2a14881c3822ac505e1d431ce
+ sha256sums = 30ce091fc5eb37be72af6bf3a63c8fa6393c5903899eb9f6630a36661e86c76e
+ sha256sums = 98b312cc5c49fc8b39eaca9bcbda3986f661db078ed6490a9759579126bcd4ce
+ sha256sums = 772e344deae14bfeb02f9e889abef468b308f0e287fd2ce60e121d24f41a5355
+ sha256sums = 5eb4912284c43c32916c1fcd1b95eaae751be3dccbfb9cd5b569a0d99e5d92d4
+ sha256sums = ba10fc5d828245213edc73d6cb58d548519bec46def84a6b2d32c18ac02b3917
sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3
sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422
sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a
diff --git a/PKGBUILD b/PKGBUILD
index 7fc916943a15..14c80cc77969 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
#Maintainer: Gharim Turen <gharim@turen.de>
pkgname=evesetup
pkgver=1548102
-pkgrel=5
+pkgrel=6
pkgdesc="An inofficial EVE Online Launcher Setup Tool."
arch=(x86_64)
url="https://forums.eveonline.com/t/eve-installing/71494"
@@ -108,18 +108,18 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
'e9c2145865e425a13fa38f433f2aec0574c44950442dffb900ae41085bfe7566'
'b1faa042a96746fe80ea5d85a0c26e80b29353394897774f45b9e48e0639a1d8'
'80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
- 'fb01952face95a91f6ab4590e6be9b460b08779766078698a7bcf7c57a5d34e4'
+ 'd60152349595e64fa625844fc783f84734845d630c8d29819b0b357d978cbc85'
'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
'9079fd9ed7967479b7a78643d43537c04f9275303cd713651d2481bf4c658653'
'546aaf5669dc3d3f1b2fff1b9a493d8ba31c19940a04fa4b9eb080e7301df4bd'
'c83beba543663b926d28d0eda98f1035cd73327da50f718a487763d300415a24'
'f438c7002eaf8e1186a838ac2e803242b7a2c98a22cf49622eb4a64cf4b202ec'
'04c102d6db1bb8d4159c41f32ec0aa95846c0fb519841a3c1428ab20c850e9cf'
- '25c84d6823badf7c04dd316857b144b614a917943baeb8dc769b27cd029071ff'
- '5aff377c2158ff40eb7b27f3792cc568c41a43bdbff2787178ab936fff192c8d'
- '7064241dd0b9876743ce89d0b638c9b2dc5e8153a327e44973a0424e31a715c1'
- '6f8116cbbe05808be4ecddcb782965fcbfad09645ad8153db325e8c17ef7c27b'
- 'dcb776b66f31a9f2fd545a5c6b6ef874b3f9b3c2a14881c3822ac505e1d431ce'
+ '30ce091fc5eb37be72af6bf3a63c8fa6393c5903899eb9f6630a36661e86c76e'
+ '98b312cc5c49fc8b39eaca9bcbda3986f661db078ed6490a9759579126bcd4ce'
+ '772e344deae14bfeb02f9e889abef468b308f0e287fd2ce60e121d24f41a5355'
+ '5eb4912284c43c32916c1fcd1b95eaae751be3dccbfb9cd5b569a0d99e5d92d4'
+ 'ba10fc5d828245213edc73d6cb58d548519bec46def84a6b2d32c18ac02b3917'
'69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3'
'762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422'
'47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a'
diff --git a/build_installer.sh b/build_installer.sh
index 9e3f9f87972d..5b9f79d8f3de 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -32,7 +32,7 @@ if [ ! -f "./makeself-2.4.0.run" ] ;then
if [ ! -x "$(which curl)" ] ;then
echo "Curl not found. Curl are needed for downloading makeself build tool."
echo " Please install curl with your Package Manager."
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
printf "\nGet makeself...\n\n"
@@ -41,7 +41,7 @@ fi
rcsum="$(sha256sum ./makeself-2.4.0.run | cut -d' ' -f1)"
if [ "$rcsum" != "$mscsum" ] ;then
printf "\n\nError: Checksum from makeself-2.4.0.run doesn't match!"
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
diff --git a/build_small_installer.sh b/build_small_installer.sh
index 70509f38ecaa..9347ad0d61ed 100755
--- a/build_small_installer.sh
+++ b/build_small_installer.sh
@@ -32,7 +32,7 @@ if [ ! -f "./makeself-2.4.0.run" ] ;then
if [ ! -x "$(which curl)" ] ;then
echo "Curl not found. Curl are needed for downloading makeself build tool."
echo " Please install curl with your Package Manager."
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
printf "\nGet makeself...\n\n"
@@ -41,7 +41,7 @@ fi
rcsum="$(sha256sum ./makeself-2.4.0.run | cut -d' ' -f1)"
if [ "$rcsum" != "$mscsum" ] ;then
printf "\n\nError: Checksum from makeself-2.4.0.run doesn't match!"
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
@@ -52,7 +52,7 @@ fi
rcsum="$(sha256sum ./evelauncher-$version.tar.gz| cut -d' ' -f1)"
if [ "$rcsum" != "$elcsum" ] ;then
printf "\n\nError: Checksum from evelauncher-$version.tar.gz doesn't match!"
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
printf "\nCreate clean build environment..."
diff --git a/evebackup b/evebackup
index 71bd4ed6f001..b9e45520a88d 100644
--- a/evebackup
+++ b/evebackup
@@ -13,6 +13,7 @@ BCKUPDIR=$(xdg-user-dir DOCUMENTS 2>/dev/null || true)/EVE
USERCONF=wineenv/drive_c/users/$(whoami)/Local\ Settings/Application\ Data/CCP/EVE
cd $SHAREDIR
-tar czf $BCKUPDIR/eve_userconf_$(date +%F).tar.gz --exclude=cache --exclude=Browser "$USERCONF"
+tar czf $BCKUPDIR/eve_userconf_$(date +%F).tar.gz \
+ --exclude=cache --exclude=Browser --exclude=history.txt "$USERCONF"
desktop_msg "User configuration in $BCKUPDIR stored."
diff --git a/evesetup.shlib b/evesetup.shlib
index 10c82bd2e5cf..8763d1b11b58 100644
--- a/evesetup.shlib
+++ b/evesetup.shlib
@@ -13,9 +13,9 @@ SHAREDIR="$HOME/.eve"
check_elv() {
ELBIN=$(getdate $LAUNCHER/evelauncher)
- ELBIN=$(expr $ELBIN / 60 \* 60)
+ ELBIN=$(expr $ELBIN / 180 \* 180)
ELARC=$(getdate $SETUPDIR/lib/evelauncher-$ELVER.tar.?z)
- ELARC=$(expr $ELARC / 60 \* 60)
+ ELARC=$(expr $ELARC / 180 \* 180)
if [ "$ELBIN" -lt "$ELARC" ] ;then
if [ -d "$LAUNCHER" ] ;then
rm -rf $LAUNCHER
@@ -84,7 +84,7 @@ check_wine() {
env WINEPREFIX=$WINEPREFIX \
WINEDEBUG=-all \
WINEDLLOVERRIDES="mscoree,mshtml=d" \
- $WINEPATH/wineboot
+ $WINEPATH/wine wineboot
env WINEPREFIX=$WINEPREFIX \
$WINEPATH/wine reg add \
'HKCU\Software\Wine\FileOpenAssociations' \
@@ -120,7 +120,7 @@ desktop_msg() {
getdate() {
printf $(ls -l --time-style=+%s $1 2>/dev/null | cut -d' ' -f6) \
- 2>/dev/null || printf 60
+ 2>/dev/null || printf 180
}
getval() {
diff --git a/setup.sh.in b/setup.sh.in
index 67ae94ceb894..bacb6c08e7b7 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -60,7 +60,7 @@ build_lib() {
else
echo "Curl not found. Curl are needed for downloading evelauncher binaries."
echo " Please install curl with your Package Manager."
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
printf "\nDownload evelauncher-$elver.tar.gz...\n\n"
@@ -69,7 +69,7 @@ build_lib() {
rcsum="$(sha256sum ./evelauncher-$elver.tar.gz| cut -d' ' -f1)"
if [ "$rcsum" != "$elcsum" ] ;then
printf "\n\nError: Checksum from evelauncher-$elver.tar.gz doesn't match!"
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
printf "\nExtract evelauncher-$elver.tar.gz..."
@@ -77,7 +77,7 @@ build_lib() {
echo "done."
printf "\nClean up evelauncher directory..."
cd evelauncher/
- rm -f ./*.a ./*.la ./*.prl
+ rm -f ./*.a ./*.la ./*.prl ./libxcb*
chmod 0755 ./*
chmod 0644 ./*.qm ./*.conf ./errorpage/*
echo "done."
@@ -112,7 +112,7 @@ check_req() {
else
echo "Wine not found. Please install Wine with your Package Manager."
echo "WineHQ or Developer Version are recommended."
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
if [ -x "$(which winetricks 2>/dev/null)" ] ;then
@@ -120,7 +120,7 @@ check_req() {
else
echo "Winetricks not found. Winetricks are required."
echo " Please install Winetricks with your Package Manager."
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
}
@@ -137,7 +137,7 @@ key=""
if [ $(id -u) -ne 0 ] ;then
printf "\nEVE Online Launcher Setup need root permissions."
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
diff --git a/setup_small.sh.in b/setup_small.sh.in
index 568cf7f8de16..0c7320789e14 100644
--- a/setup_small.sh.in
+++ b/setup_small.sh.in
@@ -65,7 +65,7 @@ check_req() {
printf "\nFollowing requirements are missing:\n"
printf "\n$req\n"
printf "\nPlease install these requirements with your Package Manager.\n"
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi
}
@@ -79,7 +79,7 @@ key=""
if [ $(id -u) -ne 0 ] ;then
printf "\nEVE Online Launcher Setup need root permissions."
- printf "\nExiting.\n\n"
+ printf "\nLeaving.\n\n"
exit 0
fi