diff options
| author | Jernuh Zakalwe | 2019-03-03 18:01:27 +0100 |
|---|---|---|
| committer | Jernuh Zakalwe | 2019-03-03 18:01:27 +0100 |
| commit | f6b230a1d34c339404e69e92a5774760ccea140c (patch) | |
| tree | 2519499fcb3368edddec3499725a0a85d3910bad | |
| parent | 8ea2e0d83a2a8cfa2543308fd5cb831eb89cc8ac (diff) | |
| download | aur-f6b230a1d34c339404e69e92a5774760ccea140c.tar.gz | |
Avoiding some bashism. Cosmetic changes. Wrong archive name exchanged.
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | evelauncher.sh | 6 | ||||
| -rw-r--r-- | evelauncher.sh.in | 5 | ||||
| -rw-r--r-- | evewine | 2 | ||||
| -rw-r--r-- | evewinetricks | 2 |
6 files changed, 16 insertions, 15 deletions
@@ -51,15 +51,15 @@ 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 = 11bae38d4ac7949a179c9aef41149ee8fd252f1d9d6ede052acecc32925b78fd - sha256sums = 8f1619267798081175981b30780adef839ad30997c8655bbf8542dd48ac7369b + sha256sums = e5b8246a17e3aa1800dd2388de7d4a5eb786cd2b8813e96e87b35523933a94ff + sha256sums = 8d5dbae0acd234a1a33874488168261ce3fc6f79e631a82b8f161f43a7d8ae3c sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 sha256sums = a30ffa8b8be5e589ea17446f09d69bbc18d8d9abe65e3f826062642be1de1000 sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c - sha256sums = c34173892d77a887b909dcca93fc963799f7b6815768822d3b59ccabf619c485 + sha256sums = 70ab74ee979ed39395f8f2e998f442a5ab2b5d55be7488aa642d5be09a4ded9c sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2 sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce - sha256sums = 353e627e66cf8e738507e68269c0608dd7bb69c40d5558155bbf940bc147a8b2 + sha256sums = c3718941a577a651d666be946a27a85ddc8481466ac32887bcaec91dbed02bf6 sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d sha256sums = c6cd9fc7b02815d386e5ca15ef2c39abb0588c904a071f876629a4833cfde22f sha256sums = ca0b2d07e30bc131b7dabb1d01ce9e7ad08769eec8a04531593d23f67593e43f @@ -105,15 +105,15 @@ package() { } sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731' - '11bae38d4ac7949a179c9aef41149ee8fd252f1d9d6ede052acecc32925b78fd' - '8f1619267798081175981b30780adef839ad30997c8655bbf8542dd48ac7369b' + 'e5b8246a17e3aa1800dd2388de7d4a5eb786cd2b8813e96e87b35523933a94ff' + '8d5dbae0acd234a1a33874488168261ce3fc6f79e631a82b8f161f43a7d8ae3c' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' 'a30ffa8b8be5e589ea17446f09d69bbc18d8d9abe65e3f826062642be1de1000' 'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c' - 'c34173892d77a887b909dcca93fc963799f7b6815768822d3b59ccabf619c485' + '70ab74ee979ed39395f8f2e998f442a5ab2b5d55be7488aa642d5be09a4ded9c' '04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2' '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce' - '353e627e66cf8e738507e68269c0608dd7bb69c40d5558155bbf940bc147a8b2' + 'c3718941a577a651d666be946a27a85ddc8481466ac32887bcaec91dbed02bf6' '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d' 'c6cd9fc7b02815d386e5ca15ef2c39abb0588c904a071f876629a4833cfde22f' 'ca0b2d07e30bc131b7dabb1d01ce9e7ad08769eec8a04531593d23f67593e43f' diff --git a/evelauncher.sh b/evelauncher.sh index 7826429249a7..7c908c633353 100644 --- a/evelauncher.sh +++ b/evelauncher.sh @@ -42,8 +42,8 @@ check_wine() { 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 \ + desktop_msg "Preparing wine in $WINEPREFIX" + env WINEPREFIX=$WINEPREFIX \ WINEDEBUG=-all \ WINEDLLOVERRIDES="mscoree,mshtml,winemenubuilder.exe=d" \ $WINEPATH/wine wineboot @@ -78,7 +78,7 @@ LAUNCHER="$EVEDIR/Launcher" SETUPDIR="/opt/evesetup" WINEPATH="/usr/bin" -source $SETUPDIR/lib/evelauncher.shlib +source $SETUPDIR/lib/evelauncher.shlib 2>/dev/null || . $SETUPDIR/lib/evelauncher.shlib check_env check_wine diff --git a/evelauncher.sh.in b/evelauncher.sh.in index 3d7ee5321a38..0f1de3916c9a 100644 --- a/evelauncher.sh.in +++ b/evelauncher.sh.in @@ -18,7 +18,8 @@ check_env() { echo "UseCustomWine=true" >>$CONFDIR/EVE.conf echo "CustomWinePath=$WINEPATH/wine" >>$CONFDIR/EVE.conf mkdir -p $EVEDIR/SharedCache - tar xf $SETUPDIR/lib/launcher-$ELVER.tar.xz -C $EVEDIR + tar xf $SETUPDIR/lib/evelauncher-$ELVER.tar.gz -C $EVEDIR + mv $EVEDIR/evelauncher/ $LAUNCHER/ if [ -d "$SHAREDIR/ResFiles/" ] ;then mv $SHAREDIR/ResFiles/ $EVEDIR/SharedCache/ mv $SHAREDIR/*.txt $EVEDIR/SharedCache/ @@ -88,7 +89,7 @@ LAUNCHER="$EVEDIR/Launcher" SETUPDIR="/opt/evesetup" WINEPATH="/usr/bin" -source $SETUPDIR/lib/evelauncher.shlib +source $SETUPDIR/lib/evelauncher.shlib 2>/dev/null || . $SETUPDIR/lib/evelauncher.shlib check_env check_transl @@ -1,6 +1,6 @@ #!/bin/sh -source /opt/evesetup/lib/evelauncher.shlib +source /opt/evesetup/lib/evelauncher.shlib 2>/dev/null || . /opt/evesetup/lib/evelauncher.shlib check_custom_wine diff --git a/evewinetricks b/evewinetricks index cb948ca54d82..4da66cc4df36 100644 --- a/evewinetricks +++ b/evewinetricks @@ -1,6 +1,6 @@ #!/bin/sh -source /opt/evesetup/lib/evelauncher.shlib +source /opt/evesetup/lib/evelauncher.shlib 2>/dev/null || . /opt/evesetup/lib/evelauncher.shlib check_custom_wine |