diff --git a/install.sh b/install.sh index 03f6cf7b..664a336a 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,7 @@ #!/bin/bash CUR_DIR=${PWD} + BRANCH_VERSION="Plasma/6.7" SU_CMD=sudo @@ -12,6 +13,7 @@ if [[ -z "$(command -v $SU_CMD)" ]]; then fi fi + if [ -z $LIBEXEC_DIR ]; then LIBEXEC_DIR=lib UAC_LIBEXEC_DIR=lib @@ -53,17 +55,13 @@ git clone https://gitgud.io/aeroshell/smod.git smod cd smod git pull git checkout $BRANCH_VERSION -cmake -DCMAKE_INSTALL_PREFIX=/usr -B build . || exit 1 -cmake --build build || exit 1 -$SU_CMD cmake --install build || exit 1 +bash install.sh $@ cp build/install_manifest.txt "$CUR_DIR/manifest/smod_install_manifest.txt" +cp smodglow/build-wl/install_manifest.txt "$CUR_DIR/manifest/smodglow_install_manifest.txt" if [[ ! "$*" == *"--skip-x11"* ]] then - cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DECORATION=OFF -DBUILD_EFFECTX11=ON -B build-x11 . || exit 1 - cmake --build build-x11 || exit 1 - $SU_CMD cmake --install build-x11 || exit 1 - cp build-x11/install_manifest.txt "$CUR_DIR/manifest/smodglow-x11_install_manifest.txt" + cp smodglow/build/install_manifest.txt "$CUR_DIR/manifest/smodglow-x11_install_manifest.txt" fi cd "$CUR_DIR/repos" diff --git a/uninstall.sh b/uninstall.sh index 97c99867..9a9f9295 100644 --- a/uninstall.sh +++ b/uninstall.sh @@ -17,9 +17,9 @@ BUILD_FILES=( "repos/aeroshell-workspace/build" "repos/aerothemeplasma-icons/build" "repos/aerothemeplasma-sounds/build" - "repos/aeroshell-sddm-kcm/build" "repos/smod/build" - "repos/smod/build-x11" + "repos/smod/smodglow/build" + "repos/smod/smodglow/build-wl" "repos/uac-polkit-agent/build" "build" "build_x11"