Skip to content

Commit

Permalink
correct function names
Browse files Browse the repository at this point in the history
  • Loading branch information
AlvinSchiller committed Nov 18, 2023
1 parent 03b3b02 commit 05123a3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions installation/includes/02_helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion installation/routines/setup_jukebox_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions installation/routines/setup_jukebox_webapp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions installation/routines/setup_kiosk_mode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

Expand Down

0 comments on commit 05123a3

Please sign in to comment.