diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rwxr-xr-x | build_installer.sh | 3 | ||||
| -rw-r--r-- | evelauncher.shlib | 11 | ||||
| -rw-r--r-- | setup.sh.in | 7 |
5 files changed, 19 insertions, 14 deletions
@@ -54,15 +54,15 @@ pkgbase = evesetup sha256sums = 46f7e2f2a916ae96188afd038962d3669d15da786c05945ffccd77951f29d4f2 sha256sums = 0da10efa271da16e09b6a02417d938a1be3cd5edb4d8b6d16333d2f4501771a4 sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21 - sha256sums = a30ffa8b8be5e589ea17446f09d69bbc18d8d9abe65e3f826062642be1de1000 + sha256sums = bf09c4bd0b2735eba5868e47ae49707f257ff8a3d86c9da7c0411e5c93694b69 sha256sums = f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c sha256sums = 459b74ad54268610e7e222407f2cb4efd2e9734e47c1c20c52f8f3c00034c623 sha256sums = 04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2 sha256sums = 22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce sha256sums = af9e68d643f0482259393eb326ccfbfe88c3084ebb120bb4c299abf6f6f58576 sha256sums = 2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d - sha256sums = c6cd9fc7b02815d386e5ca15ef2c39abb0588c904a071f876629a4833cfde22f - sha256sums = ca0b2d07e30bc131b7dabb1d01ce9e7ad08769eec8a04531593d23f67593e43f + sha256sums = dd21ced59bfd1d179cbce712abd6f2d607825bcc9dcac62d319ecaad51163aad + sha256sums = 25ffef61a962630968c57298bbd9da6032a0c7f2bf21d4107949cb683ab322d8 sha256sums = 2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28 sha256sums = f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2 sha256sums = 47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a @@ -108,15 +108,15 @@ sha256sums=('f49b404341e1dd48eaa2504c83f9ff07c9a4c11e1a109c67d04167dc70d65731' '46f7e2f2a916ae96188afd038962d3669d15da786c05945ffccd77951f29d4f2' '0da10efa271da16e09b6a02417d938a1be3cd5edb4d8b6d16333d2f4501771a4' '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21' - 'a30ffa8b8be5e589ea17446f09d69bbc18d8d9abe65e3f826062642be1de1000' + 'bf09c4bd0b2735eba5868e47ae49707f257ff8a3d86c9da7c0411e5c93694b69' 'f8988be390204ce645ca37f43cdb8e395970f8d6dd36095acf08c5c7cf72833c' '459b74ad54268610e7e222407f2cb4efd2e9734e47c1c20c52f8f3c00034c623' '04d2a47524cbd132aad2fd310d56515a29310a2e693ba94ce12c65cd776a70d2' '22690e393ee89703b17898038aaa37900805104e8c960b346fe1f6050edc9bce' 'af9e68d643f0482259393eb326ccfbfe88c3084ebb120bb4c299abf6f6f58576' '2520a9b19f2827fa2634ea2acae3a6f61e73aada1af0eb2029e95709f0c8927d' - 'c6cd9fc7b02815d386e5ca15ef2c39abb0588c904a071f876629a4833cfde22f' - 'ca0b2d07e30bc131b7dabb1d01ce9e7ad08769eec8a04531593d23f67593e43f' + 'dd21ced59bfd1d179cbce712abd6f2d607825bcc9dcac62d319ecaad51163aad' + '25ffef61a962630968c57298bbd9da6032a0c7f2bf21d4107949cb683ab322d8' '2c192fdc282fefafee5596b60bd1779668b611d386e2bf933eef51d39eac7a28' 'f88c7c28582b6531a021b8fcece47c906f900c48edf453dc04c349f8671cf8a2' '47accd49b64d624c6a6dee42952f8627aaabdd315fad85ef037507745d393f1a' diff --git a/build_installer.sh b/build_installer.sh index b0ee5aa819f8..39775690e819 100755 --- a/build_installer.sh +++ b/build_installer.sh @@ -43,6 +43,9 @@ done cp -f ../evelauncher.shlib evesetup/evelauncher.shlib cp -f ../evelauncher.sh.in evesetup/evelauncher.sh grep -v '^#-' ../setup.sh.in >evesetup/setup.sh +#-- testing only +#- cp -f ../setup.sh.in evesetup/setup.sh +#-- chmod a+x evesetup/setup.sh echo "done." diff --git a/evelauncher.shlib b/evelauncher.shlib index 54c3d4062b7e..4adaee57ed3b 100644 --- a/evelauncher.shlib +++ b/evelauncher.shlib @@ -11,15 +11,16 @@ desktop_msg() { check_custom_wine() { EVECONF=$HOME/.config/CCP/EVE.conf + CUSTOMWP=$(grep CustomWinePath $EVECONF | cut -d= -f2) + SHAREDIR=$(grep SharedCacheFolder $EVECONF | cut -d= -f2) UCW=$(grep UseCustomWine $EVECONF | cut -d= -f2) + WINEPREFIX=${SHAREDIR}wineenv 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 + desktop_msg "INFO: \"Use custom Wine\" not set, using internal version." + CUSTOMWP=${SHAREDIR}wine + WINEPATH=${SHAREDIR}wine/bin fi if [ ! -x "$WINEPATH/wine" ] ;then desktop_msg "ERROR: \"$CUSTOMWP\" from \"Custom Wine path\" not found!" diff --git a/setup.sh.in b/setup.sh.in index 5ed16d86ce3c..37a7cdcce4a6 100644 --- a/setup.sh.in +++ b/setup.sh.in @@ -94,8 +94,9 @@ if [ -d "${target}/bin/" ] ;then bootstrap_remove else #-- testing only -#- otarget=$(grep ^SETUPDIR= ./evelauncher.sh) -#- sed -i s,$otarget,SETUPDIR=\"$target\", ./evelauncher.sh +#- otarget=$(grep ^SETUPDIR= ./evelauncher.sh | tr -d \") +#- otarget=${otarget##*=} +#- sed -i s,$otarget,$target, ./evelauncher.sh ./evewine ./evewinetricks #-- printf "\n" read -p 'Install EVE Online Launcher Setup? (Y/n) ' key @@ -104,7 +105,7 @@ else printf "\nYou can now start EVE Online Launcher and his " && \ echo "Tools from your Application menu." #-- testing only -#- sed -i s,SETUPDIR=\"$target\",$otarget, ./evelauncher.sh +#- sed -i s,$target,$otarget, ./evelauncher.sh ./evewine ./evewinetricks #-- fi printf "\nDone.\n\n" |