diff --git a/mkosi.extra/usr/bin/set-up-systemd-extension b/mkosi.extra/usr/bin/set-up-systemd-extension index 447f29a..e2ef8f7 100755 --- a/mkosi.extra/usr/bin/set-up-systemd-extension +++ b/mkosi.extra/usr/bin/set-up-systemd-extension @@ -6,22 +6,16 @@ set -e -SYSEXT_NAME="kde" - -if test -n "$1"; then - SYSEXT_NAME="$1" -fi - -SYSEXT_BASE_LOCATION="${HOME}/${SYSEXT_NAME}/usr/" +SYSEXT_BASE_LOCATION="${HOME}/kde/usr/" SYSEXT_LOCATION="${SYSEXT_BASE_LOCATION}/lib/extension-release.d/" SYSEXT_ROOT_LOCATION="/var/lib/extensions/" echo -if [ -f "${SYSEXT_LOCATION}/extension-release.${SYSEXT_NAME}" ]; then - echo '== Systemd system extension ${SYSEXT_NAME}: already set up, skipping ==' +if [ -f "${SYSEXT_LOCATION}/extension-release.kde" ]; then + echo '== Systemd system extension: already set up, skipping ==' else echo '== Systemd system extension: needs setup ==' - echo "Setting up extension ${SYSEXT_NAME} at ${SYSEXT_BASE_LOCATION}..." + echo "Setting up extension at ${SYSEXT_BASE_LOCATION}..." # Create directory to hold this system extension mkdir -p "${SYSEXT_LOCATION}" @@ -30,21 +24,21 @@ else run0 sh <