Only warn if an app is already installed.
This commit is contained in:
parent
0e9148d6a4
commit
7eeab15a4b
@ -758,6 +758,10 @@ echononl "Install nextcloud app '$_app'.."
|
|||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
echo_ok
|
echo_ok
|
||||||
|
else
|
||||||
|
if grep -q -E "${_app}\s+already\s+installed" $log_file ; then
|
||||||
|
echo_skipped
|
||||||
|
warn "$(cat $log_file)"
|
||||||
else
|
else
|
||||||
echo_failed
|
echo_failed
|
||||||
error "$(cat $log_file)"
|
error "$(cat $log_file)"
|
||||||
@ -771,6 +775,7 @@ else
|
|||||||
done
|
done
|
||||||
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
echononl "Eanable nextcloud app '$_app'.."
|
echononl "Eanable nextcloud app '$_app'.."
|
||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
||||||
@ -802,6 +807,10 @@ echononl "Install nextcloud app '$_app'.."
|
|||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
echo_ok
|
echo_ok
|
||||||
|
else
|
||||||
|
if grep -q -E "${_app}\s+already\s+installed" $log_file ; then
|
||||||
|
echo_skipped
|
||||||
|
warn "$(cat $log_file)"
|
||||||
else
|
else
|
||||||
echo_failed
|
echo_failed
|
||||||
error "$(cat $log_file)"
|
error "$(cat $log_file)"
|
||||||
@ -815,6 +824,7 @@ else
|
|||||||
done
|
done
|
||||||
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
echononl "Eanable nextcloud app '$_app'.."
|
echononl "Eanable nextcloud app '$_app'.."
|
||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
||||||
@ -846,6 +856,10 @@ echononl "Install nextcloud app '$_app'.."
|
|||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
echo_ok
|
echo_ok
|
||||||
|
else
|
||||||
|
if grep -q -E "${_app}\s+already\s+installed" $log_file ; then
|
||||||
|
echo_skipped
|
||||||
|
warn "$(cat $log_file)"
|
||||||
else
|
else
|
||||||
echo_failed
|
echo_failed
|
||||||
error "$(cat $log_file)"
|
error "$(cat $log_file)"
|
||||||
@ -859,6 +873,7 @@ else
|
|||||||
done
|
done
|
||||||
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
echononl "Eanable nextcloud app '$_app'.."
|
echononl "Eanable nextcloud app '$_app'.."
|
||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
||||||
@ -891,6 +906,10 @@ sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $l
|
|||||||
|
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
echo_ok
|
echo_ok
|
||||||
|
else
|
||||||
|
if grep -q -E "${_app}\s+already\s+installed" $log_file ; then
|
||||||
|
echo_skipped
|
||||||
|
warn "$(cat $log_file)"
|
||||||
else
|
else
|
||||||
echo_failed
|
echo_failed
|
||||||
error "$(cat $log_file)"
|
error "$(cat $log_file)"
|
||||||
@ -904,6 +923,7 @@ else
|
|||||||
done
|
done
|
||||||
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
echononl "Eanable nextcloud app '$_app'.."
|
echononl "Eanable nextcloud app '$_app'.."
|
||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
||||||
@ -935,6 +955,10 @@ echononl "Install nextcloud app '$_app'.."
|
|||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
echo_ok
|
echo_ok
|
||||||
|
else
|
||||||
|
if grep -q -E "${_app}\s+already\s+installed" $log_file ; then
|
||||||
|
echo_skipped
|
||||||
|
warn "$(cat $log_file)"
|
||||||
else
|
else
|
||||||
echo_failed
|
echo_failed
|
||||||
error "$(cat $log_file)"
|
error "$(cat $log_file)"
|
||||||
@ -948,6 +972,7 @@ else
|
|||||||
done
|
done
|
||||||
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
echononl "Eanable nextcloud app '$_app'.."
|
echononl "Eanable nextcloud app '$_app'.."
|
||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
||||||
@ -1003,6 +1028,10 @@ echononl "Install nextcloud app '$_app'.."
|
|||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
echo_ok
|
echo_ok
|
||||||
|
else
|
||||||
|
if grep -q -E "${_app}\s+already\s+installed" $log_file ; then
|
||||||
|
echo_skipped
|
||||||
|
warn "$(cat $log_file)"
|
||||||
else
|
else
|
||||||
echo_failed
|
echo_failed
|
||||||
error "$(cat $log_file)"
|
error "$(cat $log_file)"
|
||||||
@ -1016,6 +1045,7 @@ else
|
|||||||
done
|
done
|
||||||
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
echononl "Eanable nextcloud app '$_app'.."
|
echononl "Eanable nextcloud app '$_app'.."
|
||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
||||||
@ -1045,6 +1075,10 @@ echononl "Install nextcloud app '$_app'.."
|
|||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:install "$_app" > $log_file 2>&1
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
echo_ok
|
echo_ok
|
||||||
|
else
|
||||||
|
if grep -q -E "${_app}\s+already\s+installed" $log_file ; then
|
||||||
|
echo_skipped
|
||||||
|
warn "$(cat $log_file)"
|
||||||
else
|
else
|
||||||
echo_failed
|
echo_failed
|
||||||
error "$(cat $log_file)"
|
error "$(cat $log_file)"
|
||||||
@ -1058,6 +1092,7 @@ else
|
|||||||
done
|
done
|
||||||
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
[[ $OK = "yes" ]] || fatal "Interrupted ny user."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
echononl "Eanable nextcloud app '$_app'.."
|
echononl "Eanable nextcloud app '$_app'.."
|
||||||
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
sudo -u "$HTTP_USER" "$php_binary" "${INSTALL_DIR}/occ" app:enable "$_app" > $log_file 2>&1
|
||||||
|
Loading…
Reference in New Issue
Block a user