diff --git a/.github/workflows/test_docker_debian_codename_sub_v3.yml b/.github/workflows/test_docker_debian_codename_sub_v3.yml index 54abd142a..2013e8dca 100644 --- a/.github/workflows/test_docker_debian_codename_sub_v3.yml +++ b/.github/workflows/test_docker_debian_codename_sub_v3.yml @@ -137,11 +137,8 @@ jobs: strategy: fail-fast: false matrix: - username: ['pi'] + username: ['hans'] test_script: ['run_install_common.sh', 'run_install_faststartup.sh', 'run_install_webapp_local.sh', 'run_install_webapp_download.sh'] - include: - - username: hans - test_script: run_install_user_not_pi.sh steps: - name: Set up QEMU diff --git a/ci/installation/run_install_user_not_pi.sh b/ci/installation/run_install_user_not_pi.sh deleted file mode 100644 index 76a8cd576..000000000 --- a/ci/installation/run_install_user_not_pi.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# Install Phoniebox and test it -# Used e.g. for tests on Docker - -# Objective: Test installation with script using a simple configuration - -SOURCE="${BASH_SOURCE[0]}" -SCRIPT_DIR="$(dirname "$SOURCE")" -LOCAL_INSTALL_SCRIPT_PATH="${INSTALL_SCRIPT_PATH:-${SCRIPT_DIR}/../../installation}" -LOCAL_INSTALL_SCRIPT_PATH="${LOCAL_INSTALL_SCRIPT_PATH%/}" - -# Run installation (in interactive mode) -# - - Installation must abort early - -"${LOCAL_INSTALL_SCRIPT_PATH}/install-jukebox.sh" -INSTALLATION_EXITCODE=$? - -# only count abortion due to "not user pi" as success -if [ "${INSTALLATION_EXITCODE}" -eq 2 ]; then - INSTALLATION_EXITCODE=0 -else - INSTALLATION_EXITCODE=1 -fi -exit "${INSTALLATION_EXITCODE}" diff --git a/installation/install-jukebox.sh b/installation/install-jukebox.sh index b72dd32ff..b1b1d9041 100755 --- a/installation/install-jukebox.sh +++ b/installation/install-jukebox.sh @@ -47,25 +47,7 @@ _check_os_type() { fi } -# currently the user 'pi' is mandatory -# https://github.com/MiczFlor/RPi-Jukebox-RFID/issues/1785 _check_user() { - if [ "${CURRENT_USER}" != "pi" ]; then - echo - echo "ERROR: User must be 'pi'!" - echo " Other usernames are currently not supported." - echo " Please check the wiki for further information" - exit 2 - fi - - if [ "${HOME_PATH}" != "/home/pi" ]; then - echo - echo "ERROR: HomeDir must be '/home/pi'!" - echo " Other usernames are currently not supported." - echo " Please check the wiki for further information" - exit 2 - fi - if [ ! -d "${HOME_PATH}" ]; then echo echo "ERROR: HomeDir ${HOME_PATH} does not exist."