diff --git a/installation/includes/02_helpers.sh b/installation/includes/02_helpers.sh index 39dcd6619..74d7595d4 100644 --- a/installation/includes/02_helpers.sh +++ b/installation/includes/02_helpers.sh @@ -59,8 +59,8 @@ check_os_type() { ##### Check helpers -# Check if the file(s) exist -verify_files_exist() { +# Check if the file(s) exists +verify_files_exists() { local files="$@" echo "Verify '${files}' exists" @@ -71,8 +71,8 @@ verify_files_exist() { echo "CHECK" } -# Check if the dir(s) exist -verify_dirs_exist() { +# Check if the dir(s) exists +verify_dirs_exists() { local dirs="$@" echo "Verify '${dirs}' exists" diff --git a/installation/routines/setup_jukebox_core.sh b/installation/routines/setup_jukebox_core.sh index ca538fb38..dfbed6b64 100644 --- a/installation/routines/setup_jukebox_core.sh +++ b/installation/routines/setup_jukebox_core.sh @@ -146,7 +146,7 @@ _jukebox_core_check () { libasound2-dev \ rsync - verify_dirs_exist "${VIRTUAL_ENV}" + verify_dirs_exists "${VIRTUAL_ENV}" local pip_modules=$(get_args_from_file "${INSTALLATION_PATH}/requirements.txt") verify_pip_modules pyzmq $pip_modules diff --git a/installation/routines/setup_jukebox_webapp.sh b/installation/routines/setup_jukebox_webapp.sh index cb7d0058a..d42dca916 100644 --- a/installation/routines/setup_jukebox_webapp.sh +++ b/installation/routines/setup_jukebox_webapp.sh @@ -82,14 +82,14 @@ _jukebox_webapp_check () { echo "Check WebApp Installation" | tee /dev/fd/3 if [[ $ENABLE_WEBAPP_PROD_DOWNLOAD == true || $ENABLE_WEBAPP_PROD_DOWNLOAD == release-only ]] ; then - verify_dirs_exist "${INSTALLATION_PATH}/src/webapp/build" + verify_dirs_exists "${INSTALLATION_PATH}/src/webapp/build" fi if [[ $ENABLE_INSTALL_NODE == true ]] ; then verify_apt_packages nodejs fi verify_apt_packages nginx - verify_files_exist "${WEBAPP_NGINX_SITE_DEFAULT_CONF}" + verify_files_exists "${WEBAPP_NGINX_SITE_DEFAULT_CONF}" check_service_enablement nginx.service enabled } diff --git a/installation/routines/setup_kiosk_mode.sh b/installation/routines/setup_kiosk_mode.sh index 576cbc75a..7864e020a 100644 --- a/installation/routines/setup_kiosk_mode.sh +++ b/installation/routines/setup_kiosk_mode.sh @@ -68,13 +68,13 @@ _kiosk_mode_check () { openbox \ chromium-browser - verify_files_exist "${KIOSK_MODE_BASHRC}" + verify_files_exists "${KIOSK_MODE_BASHRC}" verify_file_contains_string "${KIOSK_MODE_CONF_HEADER}" "${KIOSK_MODE_BASHRC}" - verify_files_exist "${KIOSK_MODE_XINITRC}" + verify_files_exists "${KIOSK_MODE_XINITRC}" verify_file_contains_string "${KIOSK_MODE_CONF_HEADER}" "${KIOSK_MODE_XINITRC}" - verify_files_exist "${KIOSK_MODE_CHROMIUM_CUSTOM_DISABLE_UPDATE_CHECK}" + verify_files_exists "${KIOSK_MODE_CHROMIUM_CUSTOM_DISABLE_UPDATE_CHECK}" verify_file_contains_string "${KIOSK_MODE_CONF_HEADER}" "${KIOSK_MODE_CHROMIUM_CUSTOM_DISABLE_UPDATE_CHECK}" }