Refactor build script for custom ISO creation and update hardware configuration
- Replaced OS-specific build method with a custom ISO builder in the build-for-hardware.sh script. - Updated output file naming to reflect the correct Alpine version in the build process. - Adjusted build dates in hardware configuration files for HP ProDesk, merged, and Start9 Pure profiles to the latest timestamp.
This commit is contained in:
@@ -269,26 +269,20 @@ export ALPINE_VERSION
|
||||
export ARCH
|
||||
export BUILD_TYPE
|
||||
|
||||
# Determine build method based on OS
|
||||
if [ "$(uname)" = "Darwin" ]; then
|
||||
echo -e "${BLUE}🍎 Building on macOS via Docker${NC}"
|
||||
"$SCRIPT_DIR/build-macos.sh" "$BUILD_TYPE"
|
||||
else
|
||||
echo -e "${BLUE}🐧 Building on Linux${NC}"
|
||||
if [ -f /etc/alpine-release ]; then
|
||||
echo -e "${GREEN}✓${NC} Alpine Linux detected, using native build"
|
||||
"$SCRIPT_DIR/build-alpine-native.sh" "$BUILD_TYPE"
|
||||
else
|
||||
echo -e "${YELLOW}⚠${NC} Non-Alpine Linux, using Docker build"
|
||||
"$SCRIPT_DIR/build-linux.sh" "$BUILD_TYPE"
|
||||
fi
|
||||
fi
|
||||
# Determine build method - use custom ISO builder
|
||||
echo ""
|
||||
echo -e "${BLUE}🔨 Building custom ISO from Alpine base...${NC}"
|
||||
"$SCRIPT_DIR/build-custom-iso.sh" || {
|
||||
echo ""
|
||||
echo -e "${RED}❌ ISO build failed${NC}"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Rename output with hardware target
|
||||
# Rename output with hardware target
|
||||
OUTPUT_DIR="$SCRIPT_DIR/results"
|
||||
if [ -f "$OUTPUT_DIR/archipelago-${ARCHIPELAGO_VERSION}-${ARCH}.iso" ]; then
|
||||
mv "$OUTPUT_DIR/archipelago-${ARCHIPELAGO_VERSION}-${ARCH}.iso" \
|
||||
"$OUTPUT_DIR/archipelago-${ARCHIPELAGO_VERSION}-${HARDWARE_PROFILE}-${ARCH}.iso"
|
||||
if [ -f "$OUTPUT_DIR/archipelago-${ALPINE_VERSION}-${ARCH}.iso" ]; then
|
||||
mv "$OUTPUT_DIR/archipelago-${ALPINE_VERSION}-${ARCH}.iso" \
|
||||
"$OUTPUT_DIR/archipelago-${ALPINE_VERSION}-${HARDWARE_PROFILE}-${ARCH}.iso"
|
||||
|
||||
echo ""
|
||||
echo -e "${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
|
||||
@@ -296,12 +290,12 @@ if [ -f "$OUTPUT_DIR/archipelago-${ARCHIPELAGO_VERSION}-${ARCH}.iso" ]; then
|
||||
echo -e "${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
|
||||
echo ""
|
||||
echo -e " ${YELLOW}Hardware:${NC} ${HARDWARE_NAME}"
|
||||
echo -e " ${YELLOW}ISO File:${NC} archipelago-${ARCHIPELAGO_VERSION}-${HARDWARE_PROFILE}-${ARCH}.iso"
|
||||
echo -e " ${YELLOW}ISO File:${NC} archipelago-${ALPINE_VERSION}-${HARDWARE_PROFILE}-${ARCH}.iso"
|
||||
echo -e " ${YELLOW}Location:${NC} ${OUTPUT_DIR}/"
|
||||
echo ""
|
||||
echo -e "${BLUE}Next Steps:${NC}"
|
||||
echo -e " 1. Flash ISO to USB drive:"
|
||||
echo -e " ${YELLOW}sudo dd if=${OUTPUT_DIR}/archipelago-${ARCHIPELAGO_VERSION}-${HARDWARE_PROFILE}-${ARCH}.iso of=/dev/sdX bs=1M${NC}"
|
||||
echo -e " ${YELLOW}sudo dd if=${OUTPUT_DIR}/archipelago-${ALPINE_VERSION}-${HARDWARE_PROFILE}-${ARCH}.iso of=/dev/sdX bs=1M${NC}"
|
||||
echo ""
|
||||
echo -e " 2. Boot ${HARDWARE_NAME} from USB"
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user