This commit is contained in:
@@ -312,7 +312,7 @@ PY
|
|||||||
NO_SERVICE=0
|
NO_SERVICE=0
|
||||||
PUBLIC_KEY="$(<"$tmp/public.pem")"
|
PUBLIC_KEY="$(<"$tmp/public.pem")"
|
||||||
|
|
||||||
detect_platform() { PLATFORM=darwin; }
|
detect_platform() { PLATFORM=darwin; ARCH=amd64; }
|
||||||
check_and_install_dependencies() { JAVA_BIN="$(command -v java)"; return 0; }
|
check_and_install_dependencies() { JAVA_BIN="$(command -v java)"; return 0; }
|
||||||
start_service() { return 0; }
|
start_service() { return 0; }
|
||||||
wait_for_installer() { return 0; }
|
wait_for_installer() { return 0; }
|
||||||
@@ -323,7 +323,7 @@ PY
|
|||||||
[[ -r "$INSTALL_ROOT/current/app/kaidi-erp.jar" ]] || return 1
|
[[ -r "$INSTALL_ROOT/current/app/kaidi-erp.jar" ]] || return 1
|
||||||
(
|
(
|
||||||
source "$ERP_CONFIG_ROOT/erp.env"
|
source "$ERP_CONFIG_ROOT/erp.env"
|
||||||
[[ "$SPRING_PROFILES_ACTIVE" == "postgres" ]]
|
[[ -z "${SPRING_PROFILES_ACTIVE:-}" ]]
|
||||||
[[ "$OA_UPDATE_ENABLED" == "true" ]]
|
[[ "$OA_UPDATE_ENABLED" == "true" ]]
|
||||||
[[ "$OA_UPDATE_GITEA_BASE_URL" == "http://127.0.0.1:$port" ]]
|
[[ "$OA_UPDATE_GITEA_BASE_URL" == "http://127.0.0.1:$port" ]]
|
||||||
[[ "$ERP_SETUP_TOKEN" =~ ^[0-9a-f]{64}$ ]]
|
[[ "$ERP_SETUP_TOKEN" =~ ^[0-9a-f]{64}$ ]]
|
||||||
@@ -528,6 +528,7 @@ test_installer_requires_explicit_gitea_url() (
|
|||||||
set --
|
set --
|
||||||
source "$root/install.sh"
|
source "$root/install.sh"
|
||||||
GITEA_BASE_URL=
|
GITEA_BASE_URL=
|
||||||
|
NO_SERVICE=1
|
||||||
main
|
main
|
||||||
' _ "$PROJECT_ROOT" 2>&1)" || status=$?
|
' _ "$PROJECT_ROOT" 2>&1)" || status=$?
|
||||||
[[ "$status" -ne 0 && "$output" == *'Gitea URL is required'* ]]
|
[[ "$status" -ne 0 && "$output" == *'Gitea URL is required'* ]]
|
||||||
|
|||||||
Reference in New Issue
Block a user