diff --git a/core/build.func b/core/build.func index 40a683a..0495804 100644 --- a/core/build.func +++ b/core/build.func @@ -6,17 +6,34 @@ variables() { INTEGER='^[0-9]+([.][0-9]+)?$' PVEHOST_NAME=$(hostname) METHOD="default" - RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)" + + if [[ "$OSTYPE" == "darwin"* ]]; then + RANDOM_UUID="$(uuidgen | tr '[:upper:]' '[:lower:]')" + else + RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)" + fi + EXECUTION_ID="${RANDOM_UUID}" SESSION_ID="${RANDOM_UUID:0:8}" - INSTALL_LOG="/opt/dynr/INSTALL_LOG_${NSAPP}.log" + + if [[ "$OSTYPE" == "darwin"* ]]; then + INSTALL_LOG="/tmp/dynr/INSTALL_LOG_${NSAPP}.log" + else + INSTALL_LOG="/opt/dynr/INSTALL_LOG_${NSAPP}.log" + fi + CTTYPE="${CTTYPE:-${CT_TYPE:-1}}" parse_dev_mode if [[ "${DEV_MODE_LOGS:-false}" == "true" ]]; then - mkdir -p /var/log/dynr - BUILD_LOG="/var/log/dynr/create-lxc-${SESSION_ID}-$(date +%Y%m%d_%H%M%S).log" + if [[ "$OSTYPE" == "darwin"* ]]; then + mkdir -p /tmp/dynr + BUILD_LOG="/tmp/dynr/create-lxc-${SESSION_ID}-$(date +%Y%m%d_%H%M%S).log" + else + mkdir -p /var/log/dynr + BUILD_LOG="/var/log/dynr/create-lxc-${SESSION_ID}-$(date +%Y%m%d_%H%M%S).log" + fi fi if command -v pveversion >/dev/null 2>&1; then @@ -39,7 +56,11 @@ variables() { export APP_DEFAULT_DISK="${var_disk}" fi - mkdir -p /opt/dynr 2>/dev/null + if [[ "$OSTYPE" == "darwin"* ]]; then + mkdir -p /tmp/dynr 2>/dev/null + else + mkdir -p /opt/dynr 2>/dev/null + fi } DYNR_CORE="https://git.dynastyrevolution.com/DYNR/DynastyRevolution-Scripts/raw/branch/main/core" @@ -71,7 +92,7 @@ github_api_check() { } check_manifest_updates() { - local remote_script="${DYNR_REPO}/modules/social/${NSAPP}.sh" + local remote_script="${DYNR_REPO}/${MODULE_PATH}" local remote_ver=$(curl -fsSL --connect-timeout 2 "$remote_script" | grep -m 1 "VERSION=" | cut -d'"' -f2 || echo "0") if [[ "$remote_ver" > "$VERSION" ]]; then @@ -109,22 +130,22 @@ initiate_remote_strike() { exit_script fi - local payload="${DYNR_REPO}/modules/social/${NSAPP}.sh" + local script_home="${DYNR_REPO}/${MODULE_PATH}" clear echo -e "${PURPLE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}" echo -e " ${GOLD}INITIATING REMOTE PROVISIONING${NC}" echo -e "${PURPLE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}" - echo -e "${BLUE}Target Host:${NC} $target_host" - echo -e "${BLUE}User :${NC} $target_user" - echo -e "${BLUE}Payload: ${NC} $payload" + echo -e "${BLUE}Target Host: ${NC} $target_host" + echo -e "${BLUE}User: ${NC} $target_user" + echo -e "${BLUE}Script URL: ${NC} $script_home" echo -e "${PURPLE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}" echo "" - if ssh -t "${target_user}@${target_host}" "bash -c 'curl -fsSL $payload | bash'"; then - msg_ok "Strike Successful." + if ssh -t "${target_user}@${target_host}" "bash -c 'curl -fsSL $script_home | bash'"; then + msg_ok "Provision Successful." else - msg_error "Strike Failure. Check logs at: /tmp/INSTALL_LOG_${NSAPP}.log" + msg_error "Provision Failure. Check logs at: ${INSTALL_LOG}" fi exit 0 }