Skip to content
Snippets Groups Projects
Commit fb8247d0 authored by Bob Mottram's avatar Bob Mottram
Browse files

Does need extra wildcard

parent 9358f648
No related branches found
No related tags found
No related merge requests found
......@@ -1176,7 +1176,7 @@ function after_setup_has_finished {
function install_apps_from_webadmin {
if [ -f "$pending_installs" ]; then
linestr=$(head -n 1 "$pending_installs")
if [[ "$linestr" == "install_"* && "$linestr" != *'_running' ]]; then
if [[ "$linestr" == "install_"* && "$linestr" != *'_running'* ]]; then
app_name=$(echo "$linestr" | awk -F '_' '{print $2}' | awk -F ',' '{print $1}')
if [ -f "/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}" ]; then
app_domain=$(echo "$linestr" | awk -F ',' '{print $2}')
......@@ -1232,7 +1232,7 @@ function install_apps_from_webadmin {
notification_str="Installed successfully"
fi
translated_notification_str=$(web_admin_translate_text "$notification_str")
/usr/local/bin/${PROJECT_NAME}-notification -s "[${PROJECT_NAME}] ${app_name}" -m "${translated_notification_str}"
/usr/local/bin/${PROJECT_NAME}-notification -s "${PROJECT_NAME} ${app_name}" -m "${translated_notification_str}"
chown www-data:www-data "$webadmin_install_dir/applog.txt"
else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment