diff options
| author | Jernuh Zakalwe | 2021-06-01 10:41:28 +0200 |
|---|---|---|
| committer | Jernuh Zakalwe | 2021-06-01 10:41:28 +0200 |
| commit | 712244a463623016e5b339ccbc7429ff92ba36bc (patch) | |
| tree | ce66d1a767b30e0b12d66cbcd0de7db253c9d293 | |
| parent | 39087348ed85c595e895b90174e2b89af2df0a0a (diff) | |
| download | aur-712244a463623016e5b339ccbc7429ff92ba36bc.tar.gz | |
in setup_lite.sh.in EndeavourOS in arch tree added
minor changes in setup.sh.in and setup_lite.sh.in
| -rw-r--r-- | setup.sh.in | 5 | ||||
| -rw-r--r-- | setup_lite.sh.in | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/setup.sh.in b/setup.sh.in index ee91464e2b73..fa32e18b63c4 100644 --- a/setup.sh.in +++ b/setup.sh.in @@ -196,9 +196,8 @@ else bootstrap_install printf "\nYou can now start EVE Online Launcher and his Tools:\n\n" for cmd in *.desktop ;do - oexec=$(grep Exec= $cmd | cut -d= -f2); oexec=${oexec##*/} - [ ! "$oexec" = "evelauncher.sh" ] && \ - printf " $oexec\t- $(grep Comment= $cmd | cut -d= -f2)\n" + oexec=$(sed -rn 's,^Exec=,,;s,.*/,,p' $cmd) + [ ! "$oexec" = "evelauncher.sh" ] && printf " $oexec\t- $(sed -rn 's,^Comment=,,p' $cmd)\n" done printf "\n evelauncher.sh\t- EVE Online Launcher\n" fi diff --git a/setup_lite.sh.in b/setup_lite.sh.in index 07556e30dc90..8aa86f35add7 100644 --- a/setup_lite.sh.in +++ b/setup_lite.sh.in @@ -77,7 +77,7 @@ pkg_install() { done set -e if [ ! -z "$mreq" ] ;then - printf "$distro\n$mreq\n" >packages.list + printf "#$distro\n$mreq\n" >packages.list printf "\n" $inscmd $mreq fi @@ -86,7 +86,7 @@ pkg_install() { check_req() { printf "\nChecking requirements...\n\n" case $distro in - "Arch Linux"|"Manjaro Linux") + "Arch Linux"|"Manjaro Linux"|"EndeavourOS") qrycmd="pacman -Q" inscmd="pacman -S" req="lsof openssl p7zip qt5-translations qt5-webengine qt5-websockets vulkan-icd-loader " @@ -149,7 +149,7 @@ if [ $(id -u) -ne 0 ] ;then exit 0 fi -distro=$(sed -rn 's,^NAME=(.+),\1,p' /etc/os-release 2>/dev/null | tr -d \") #' +distro=$(sed -rn 's,^NAME=,,p' /etc/os-release 2>/dev/null | tr -d \") if [ -d "$destdir" ] ;then printf "\n" @@ -168,9 +168,8 @@ else bootstrap_install printf "\nYou can now start EVE Online Launcher and his Tools:\n\n" for cmd in *.desktop ;do - oexec=$(grep Exec= $cmd | cut -d= -f2); oexec=${oexec##*/} - [ ! "$oexec" = "evelauncher.sh" ] && \ - printf " $oexec\t- $(grep Comment= $cmd | cut -d= -f2)\n" + oexec=$(sed -rn 's,^Exec=,,;s,.*/,,p' $cmd) + [ ! "$oexec" = "evelauncher.sh" ] && printf " $oexec\t- $(sed -rn 's,^Comment=,,p' $cmd)\n" done printf "\n evelauncher.sh\t- EVE Online Launcher\n" fi |