1.5.0

EdgeAdmin/build/build.sh

@@ -97,12 +97,10 @@ function build() {
 
 	# create dir & copy files
 	echo "copying ..."
-	if [ ! -d "$DIST" ]; then
-		mkdir "$DIST"
-		mkdir "$DIST"/bin
-		mkdir "$DIST"/configs
-		mkdir "$DIST"/logs
-	fi
+	rm -rf "$DIST"
+	mkdir -p "$DIST"/bin
+	mkdir -p "$DIST"/configs
+	mkdir -p "$DIST"/logs
 
 	cp -R "$ROOT"/../web "$DIST"/
 	rm -f "$DIST"/web/tmp/*
@@ -135,30 +133,6 @@ function build() {
 	rm -f "$(basename "$EDGE_API_ZIP_FILE")"
 
 	# ensure edge-api package always contains fluent-bit runtime assets/packages
-	FLUENT_ROOT="$ROOT/../../deploy/fluent-bit"
-	FLUENT_DIST="$DIST/edge-api/deploy/fluent-bit"
-	if [ -d "$FLUENT_ROOT" ]; then
-		verify_fluent_bit_package_matrix "$FLUENT_ROOT" "$ARCH" || exit 1
-		rm -rf "$FLUENT_DIST"
-		mkdir -p "$FLUENT_DIST"
-
-		FLUENT_FILES=(
-			"parsers.conf"
-		)
-		for file in "${FLUENT_FILES[@]}"; do
-			if [ -f "$FLUENT_ROOT/$file" ]; then
-				cp "$FLUENT_ROOT/$file" "$FLUENT_DIST/"
-			fi
-		done
-
-		if [ -d "$FLUENT_ROOT/packages" ]; then
-			cp -R "$FLUENT_ROOT/packages" "$FLUENT_DIST/"
-		fi
-
-		rm -f "$FLUENT_DIST/.gitignore"
-		rm -f "$FLUENT_DIST"/logs.db*
-		rm -rf "$FLUENT_DIST/storage"
-	fi
 
 	# 鍒犻櫎 MaxMind 鏁版嵁搴撴枃浠讹紙浣跨敤宓屽叆鐨勬暟鎹簱锛屼笉闇€瑕佸閮ㄦ枃浠讹級
 	find . -name "*.mmdb" -type f -delete
@@ -220,39 +194,6 @@ function build() {
 	echo "[done]"
 }
 
-function verify_fluent_bit_package_matrix() {
-	FLUENT_ROOT=$1
-	ARCH=$2
-	REQUIRED_FILES=()
-	if [ "$ARCH" = "amd64" ]; then
-		REQUIRED_FILES=(
-			"packages/linux-amd64/fluent-bit_4.2.2_amd64.deb"
-			"packages/linux-amd64/fluent-bit-4.2.2-1.x86_64.rpm"
-		)
-	elif [ "$ARCH" = "arm64" ]; then
-		REQUIRED_FILES=(
-			"packages/linux-arm64/fluent-bit_4.2.2_arm64.deb"
-			"packages/linux-arm64/fluent-bit-4.2.2-1.aarch64.rpm"
-		)
-	else
-		echo "[error] unsupported arch for fluent-bit package validation: $ARCH"
-		return 1
-	fi
-
-	MISSING=0
-	for FILE in "${REQUIRED_FILES[@]}"; do
-		if [ ! -f "$FLUENT_ROOT/$FILE" ]; then
-			echo "[error] fluent-bit matrix package missing: $FLUENT_ROOT/$FILE"
-			MISSING=1
-		fi
-	done
-
-	if [ "$MISSING" -ne 0 ]; then
-		return 1
-	fi
-	return 0
-}
-
 function lookup-version() {
 	FILE=$1
 	VERSION_DATA=$(cat "$FILE")