From 3ad6d8148741b13994491bf93ab2f2f4b8dcc01e Mon Sep 17 00:00:00 2001
From: 1000TurquoisePogs <sgrady@rocketsoftware.com>
Date: Tue, 5 Nov 2024 13:25:43 +0100
Subject: [PATCH] Bugfix to remove duplicate node validation that caused
 misleading messages

Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com>
---
 CHANGELOG.md    |  3 +++
 bin/start.sh    |  5 ++---
 bin/validate.sh | 20 --------------------
 manifest.yaml   |  1 -
 4 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 bin/validate.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0d0a6d..4b3c465 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to the Zlux App Server package will be documented in this file.
 
+## v2.18.1
+- Bugfix: app-server no longer causes Zowe to print "FSUM7422 node is not found" and "Node found in NODE_HOME" upon startup. This avoids confusion about if node requirements are met. (#324)
+
 ## v2.17.0
 - Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) (#303)
 - Enhancement: The app-server configure stage performance increased due to combining two seperate processes in this stage (plugins-init.js and initInstance.js) into one. (#304)
diff --git a/bin/start.sh b/bin/start.sh
index 6c24f83..80b2bde 100755
--- a/bin/start.sh
+++ b/bin/start.sh
@@ -27,9 +27,8 @@ if [ -n "${ZWE_zowe_runtimeDirectory}" ]; then
   # used for relativeTo plugins
   export ZLUX_ROOT_DIR=$COMPONENT_HOME/share
 else
- # dev env
- . ./validate.sh
- COMPONENT_HOME=$(cd ../..; pwd)
+  # dev env
+  COMPONENT_HOME=$(cd ../..; pwd)
 
   # used for relativeTo plugins
   export ZLUX_ROOT_DIR=$COMPONENT_HOME
diff --git a/bin/validate.sh b/bin/validate.sh
deleted file mode 100644
index 32739e8..0000000
--- a/bin/validate.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# This program and the accompanying materials are
-# made available under the terms of the Eclipse Public License v2.0 which accompanies
-# this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
-# 
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Copyright Contributors to the Zowe Project.
-
-result=$(type node)
-if [ "$?" -ne "0" ]; then
-  if [ -e "${NODE_HOME}/bin/node" ]; then
-    echo "Node found in NODE_HOME"
-  elif [ -e "${ZOWE_NODE_HOME}/bin/node" ]; then
-    echo "Node found in NODE_HOME"
-  else 
-    echo "Error: node not found, app-server cannot run"
-    exit 1
-  fi
-fi
diff --git a/manifest.yaml b/manifest.yaml
index 30b7c30..b760926 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -28,7 +28,6 @@ commands:
   install: share/zlux-app-server/bin/internal-install.sh
   start: bin/start.sh
   configure: bin/configure.sh
-  validate: bin/validate.sh
 # we do not specify encoding here because its already tagged ascii
 apimlServices:
   dynamic: