From 131a40fdf13e20645adec252bd19bb8c4f46773d Mon Sep 17 00:00:00 2001 From: Leon Date: Sun, 28 Mar 2021 12:15:21 +0200 Subject: [PATCH] Fix install script --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- install.sh | 23 +++-------------------- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 14b4eb17b92..b7fc0833e84 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = karaokemugen pkgdesc = Karaoke playlist manager/player app used in parties or events. pkgver = 4.1.18 - pkgrel = 1 + pkgrel = 2 url = https://mugen.karaokes.moe/ install = karaokemugen.install arch = any @@ -25,7 +25,7 @@ pkgbase = karaokemugen source = karaokemugen.desktop md5sums = SKIP md5sums = SKIP - md5sums = 4ad5390b139dc5b5e78e6eef8411e90b + md5sums = 412f93c38e0d79eb2d98cce3afd2a194 md5sums = 0d0d432f35c56a962f9d386f391c6036 md5sums = 5e9a33a42fef7572b7e0fa504c586f32 md5sums = 10561eed906a5efeed427f90501b4f49 diff --git a/PKGBUILD b/PKGBUILD index 0800503c727..58a445fbd8b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: leonekmi pkgname=karaokemugen pkgver=4.1.18 -pkgrel=1 +pkgrel=2 pkgdesc="Karaoke playlist manager/player app used in parties or events." arch=('any') url="https://mugen.karaokes.moe/" @@ -25,7 +25,7 @@ source=('karaokemugen::git+https://lab.shelter.moe/karaokemugen/karaokemugen-app noextract=() md5sums=('SKIP' 'SKIP' - '4ad5390b139dc5b5e78e6eef8411e90b' + '412f93c38e0d79eb2d98cce3afd2a194' '0d0d432f35c56a962f9d386f391c6036' '5e9a33a42fef7572b7e0fa504c586f32' '10561eed906a5efeed427f90501b4f49') diff --git a/install.sh b/install.sh index 03dd52470cd..f0266b28d7e 100755 --- a/install.sh +++ b/install.sh @@ -27,10 +27,10 @@ check_postgres() { } check_mugen() { - if [ -f "/opt/karaokemugen/karaokemugen" ]; then - echo -e "${_COL_GREEN_}Karaoke Mugen is installed in /opt/karaokemugen." + if [ -f "/usr/lib/karaokemugen/asar/app.asar" ]; then + echo -e "${_COL_GREEN_}Karaoke Mugen is installed in /usr/lib/karaokemugen." else - echo -e "${_COL_BRED_}Karaoke Mugen is not installed in /opt/karaokemugen. Exiting." + echo -e "${_COL_BRED_}Karaoke Mugen is not installed in /usr/lib/karaokemugen. Exiting." exit 1 fi } @@ -68,23 +68,6 @@ if [[ $(which tput > /dev/null 2>&1 && tput -T "${TERM}" colors || echo -n '0') _BEGIN_="${_COL_BRED_}-> ${_COL_BBLUE_}" fi -while getopts ":g" opt; do - case ${opt} in - g ) - #target=$OPTARG - echo -e "${_COL_YELLOW_}You may have to enter your sudo password" - add_user_to_group - echo -e "${_BEGIN_}Done! You need to restart your session to apply these changes." - exit 0 - ;; - \? ) - echo "Invalid option: $OPTARG" 1>&2 - exit 1 - ;; - esac -done -shift $((OPTIND -1)) - echo -e "${_BEGIN_}Welcome to the Karaoke Mugen installer!" echo -e "${_COL_YELLOW_}⚠️ You may have to enter your sudo password a couple times during this installation." echo -e "${_COL_YELLOW_}This script may not work if you tweaked your PostgreSQL configuration."