mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Check PHP dependencies in daily.sh (#12260)" (#12271)

Browse Source 
This reverts commit d82d2f1f19.
This commit is contained in:
Jellyfrog
2020-10-29 15:11:32 +01:00
committed by GitHub
parent 399858e5b5
commit b866bcf2ab
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daily.sh
View File

@@ -72,7 +72,7 @@ status_run() {
else
printf " \033[0;31mFAIL\033[0m\n";
if [[ "${arg_option}" == "update" ]]; then
php "${LIBRENMS_DIR}/daily.php" -f notify -o "${tmp}" > /dev/null 2>&1
php "${LIBRENMS_DIR}/daily.php" -f notify -o "${tmp}"
fi
if [[ ! -z "${tmp}" ]]; then
# print output in case of failure
@@ -126,9 +126,6 @@ set_notifiable_result() {
# Exit-Code: 0 >= min ver, 1 < min ver
#######################################
check_dependencies() {
# Check first, no point in continuing otherwise.
php_dependencies
local branch=$(git rev-parse --abbrev-ref HEAD)
scripts/check_requirements.py > /dev/null 2>&1 || pip3 install -r requirements.txt > /dev/null 2>&1
@@ -181,17 +178,6 @@ check_dependencies() {
return 1;
}
#######################################
# The check-platform-reqs command checks that your PHP and extensions versions match the platform requirements of the installed packages
#
# Returns:
# Exits on error
#######################################
php_dependencies() {
status_run 'Checking PHP dependencies' "${COMPOSER} check-platform-reqs --no-dev --no-cache" 'update' || exit 1
return 0
}
#######################################
# Compare two numeric versions
# Arguments:

3
scripts/composer_wrapper.php
View File

@@ -93,8 +93,7 @@ if (! $exec) {
}
if ($exec) {
passthru("$exec " . implode(' ', array_splice($argv, 1)) . "$extra_args 2>&1", $exit_code);
exit($exit_code);
passthru("$exec " . implode(' ', array_splice($argv, 1)) . "$extra_args 2>&1");
} else {
echo "Composer not available, please manually install composer.\n";
}