Adjust script naming

ophub · ophub · commit 5247d5ead3ca · 2025-05-30T11:23:21.000+08:00
diff --git a/.github/workflows/build-armbian-docker-image.yml b/.github/workflows/build-armbian-docker-image.yml
@@ -1,11 +1,11 @@
 #=====================================================================================
 # https://github.com/ophub/amlogic-s9xxx-armbian
-# Description: Build the Docker image of Armbian
+# Description: Build Armbian Docker image
 # Instructions: https://github.com/docker/build-push-action
 # Build and Push to: https://hub.docker.com/
 #=====================================================================================
 
-name: Build the Docker image of Armbian
+name: Build Armbian Docker image
 
 on:
   repository_dispatch:
@@ -31,7 +31,7 @@ on:
 
 env:
   TZ: America/New_York
-  MAKE_DOCKER_SH: compile-kernel/tools/script/docker/armbian_docker.sh
+  MAKE_DOCKER_SH: compile-kernel/tools/script/docker/build_armbian_docker_image.sh
   DOCKER_OUTPATH: out
 
 jobs:
@@ -52,6 +52,7 @@ jobs:
                             --header "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
                             -s "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases?per_page=100" |
                             grep -o "Armbian_.*${{ inputs.source_branch }}.*/.*rootfs.tar.gz" |
+                            sort -urV |
                             head -n 1
                         )"
           [[ -z "${armbian_url}" ]] && echo -e "Armbian file not found!" && exit 1
@@ -69,11 +70,6 @@ jobs:
           ${MAKE_DOCKER_SH}
           echo "status=success" >> ${GITHUB_OUTPUT}
 
-      - name: Set up QEMU
-        id: qemu
-        if: ${{ steps.make.outputs.status }} == 'success' && !cancelled()
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         id: buildx
         if: (!cancelled())
diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml
@@ -3,7 +3,7 @@
 # Copyright (C) 2021 https://github.com/ophub/amlogic-s9xxx-armbian
 #==========================================================================
 
-name: Build armbian
+name: Build Armbian
 
 on:
   repository_dispatch:
@@ -242,7 +242,7 @@ on:
 
 env:
   TZ: America/New_York
-  ROOTFS_SCRIPT: compile-kernel/tools/script/docker/armbian_rootfs.sh
+  ROOTFS_SCRIPT: compile-kernel/tools/script/docker/build_armbian_rootfs_file.sh
 
 jobs:
   build:
diff --git a/.github/workflows/build-homeassistant.yml b/.github/workflows/build-homeassistant.yml
@@ -243,7 +243,7 @@ on:
 
 env:
   TZ: America/New_York
-  ROOTFS_SCRIPT: compile-kernel/tools/script/docker/armbian_rootfs.sh
+  ROOTFS_SCRIPT: compile-kernel/tools/script/docker/build_armbian_rootfs_file.sh
 
 jobs:
   build:
diff --git a/.github/workflows/compile-kernel.yml b/.github/workflows/compile-kernel.yml
@@ -1,10 +1,10 @@
 #==========================================================================
-# Description: Compile the kernel
+# Description: Compile the Kernel
 # Copyright (C) 2021 https://github.com/unifreq/openwrt_packit
 # Copyright (C) 2021 https://github.com/ophub/amlogic-s9xxx-armbian
 #==========================================================================
 
-name: Compile the kernel
+name: Compile the Kernel
 
 on:
   repository_dispatch:
diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml
@@ -3,7 +3,7 @@
 # Copyright (C) 2021 https://github.com/ophub/amlogic-s9xxx-armbian
 #==========================================================================
 
-name: Rebuild armbian
+name: Rebuild Armbian
 
 on:
   repository_dispatch:
diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml
@@ -3,7 +3,7 @@
 # Copyright (C) 2021 https://github.com/ophub/amlogic-s9xxx-armbian
 #==========================================================================
 
-name: Use Releases file to rebuild armbian
+name: Use Releases file to rebuild Armbian
 
 on:
   repository_dispatch:
diff --git a/compile-kernel/tools/script/docker/build_armbian_docker_image.sh b/compile-kernel/tools/script/docker/build_armbian_docker_image.sh
@@ -8,17 +8,17 @@
 # This file is a part of the Rebuild Armbian
 # https://github.com/ophub/amlogic-s9xxx-armbian
 #
-# Description: Make a docker version of Armbian.
+# Description: Build Armbian docker image.
 # Copyright (C) 2021~ https://github.com/ophub/amlogic-s9xxx-armbian
 #
 #
-# Command: ./compile-kernel/tools/script/docker/armbian_docker.sh
+# Command: ./compile-kernel/tools/script/docker/build_armbian_docker_image.sh
 #
 #======================================== Functions list ========================================
 #
-# error_msg         : Output error message
-# find_armbian      : Find Armbian file (armbian/*rootfs.tar.gz)
-# make_dockerimg    : Make docker image
+# error_msg    : Output error message
+# find_armbian : Find Armbian file (armbian/*rootfs.tar.gz)
+# build_docker : Build Armbian docker image
 #
 #================================ Set make environment variables ================================
 #
@@ -60,9 +60,9 @@ find_armbian() {
     [[ -f "${docker_path}/Dockerfile" ]] || error_msg "Missing Dockerfile."
 }
 
-make_dockerimg() {
+build_docker() {
     cd ${current_path}
-    echo -e "${STEPS} Start making docker image..."
+    echo -e "${STEPS} Start building Armbian docker image..."
 
     # Move the docker image to the output directory
     rm -rf ${out_path} && mkdir -p ${out_path}
@@ -84,11 +84,11 @@ make_dockerimg() {
 }
 
 # Show welcome message
-echo -e "${STEPS} Welcome to the Docker Image Maker Tool."
+echo -e "${STEPS} Welcome to the Armbian Docker Image Builder."
 echo -e "${INFO} Make path: [ ${PWD} ]"
 #
 find_armbian
-make_dockerimg
+build_docker
 #
 # All process completed
 wait
diff --git a/compile-kernel/tools/script/docker/build_armbian_rootfs_file.sh b/compile-kernel/tools/script/docker/build_armbian_rootfs_file.sh
@@ -8,11 +8,11 @@
 # This file is a part of the Rebuild Armbian
 # https://github.com/ophub/amlogic-s9xxx-armbian
 #
-# Description: Redo the Armbian rootfs file.
+# Description: Build Armbian rootfs file.
 # Copyright (C) 2021- https://github.com/ophub/amlogic-s9xxx-armbian
 #
-# Command: ./compile-kernel/tools/script/docker/armbian_rootfs.sh -v <VERSION_CODENAME>
-#          ./compile-kernel/tools/script/docker/armbian_rootfs.sh -v bookworm
+# Command: ./compile-kernel/tools/script/docker/build_armbian_rootfs_file.sh -v <VERSION_CODENAME>
+#          ./compile-kernel/tools/script/docker/build_armbian_rootfs_file.sh -v bookworm
 #
 #===================== Set make environment variables =====================
 #

Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,17 @@`
`8`	`8`	`# This file is a part of the Rebuild Armbian`
`9`	`9`	`# https://github.com/ophub/amlogic-s9xxx-armbian`
`10`	`10`	`#`
`11`		`-# Description: Make a docker version of Armbian.`
	`11`	`+# Description: Build Armbian docker image.`
`12`	`12`	`# Copyright (C) 2021~ https://github.com/ophub/amlogic-s9xxx-armbian`
`13`	`13`	`#`
`14`	`14`	`#`
`15`		`-# Command: ./compile-kernel/tools/script/docker/armbian_docker.sh`
	`15`	`+# Command: ./compile-kernel/tools/script/docker/build_armbian_docker_image.sh`
`16`	`16`	`#`
`17`	`17`	`#======================================== Functions list ========================================`
`18`	`18`	`#`
`19`		`-# error_msg : Output error message`
`20`		`-# find_armbian : Find Armbian file (armbian/*rootfs.tar.gz)`
`21`		`-# make_dockerimg : Make docker image`
	`19`	`+# error_msg : Output error message`
	`20`	`+# find_armbian : Find Armbian file (armbian/*rootfs.tar.gz)`
	`21`	`+# build_docker : Build Armbian docker image`
`22`	`22`	`#`
`23`	`23`	`#================================ Set make environment variables ================================`
`24`	`24`	`#`
`@@ -60,9 +60,9 @@ find_armbian() {`
`60`	`60`	`[[ -f "${docker_path}/Dockerfile" ]] \|\| error_msg "Missing Dockerfile."`
`61`	`61`	`}`
`62`	`62`
`63`		`-make_dockerimg() {`
	`63`	`+build_docker() {`
`64`	`64`	`cd ${current_path}`
`65`		`- echo -e "${STEPS} Start making docker image..."`
	`65`	`+ echo -e "${STEPS} Start building Armbian docker image..."`
`66`	`66`
`67`	`67`	`# Move the docker image to the output directory`
`68`	`68`	`rm -rf ${out_path} && mkdir -p ${out_path}`
`@@ -84,11 +84,11 @@ make_dockerimg() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`# Show welcome message`
`87`		`-echo -e "${STEPS} Welcome to the Docker Image Maker Tool."`
	`87`	`+echo -e "${STEPS} Welcome to the Armbian Docker Image Builder."`
`88`	`88`	`echo -e "${INFO} Make path: [ ${PWD} ]"`
`89`	`89`	`#`
`90`	`90`	`find_armbian`
`91`		`-make_dockerimg`
	`91`	`+build_docker`
`92`	`92`	`#`
`93`	`93`	`# All process completed`
`94`	`94`	`wait`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@`
`8`	`8`	`# This file is a part of the Rebuild Armbian`
`9`	`9`	`# https://github.com/ophub/amlogic-s9xxx-armbian`
`10`	`10`	`#`
`11`		`-# Description: Redo the Armbian rootfs file.`
	`11`	`+# Description: Build Armbian rootfs file.`
`12`	`12`	`# Copyright (C) 2021- https://github.com/ophub/amlogic-s9xxx-armbian`
`13`	`13`	`#`
`14`		`-# Command: ./compile-kernel/tools/script/docker/armbian_rootfs.sh -v <VERSION_CODENAME>`
`15`		`-# ./compile-kernel/tools/script/docker/armbian_rootfs.sh -v bookworm`
	`14`	`+# Command: ./compile-kernel/tools/script/docker/build_armbian_rootfs_file.sh -v <VERSION_CODENAME>`
	`15`	`+# ./compile-kernel/tools/script/docker/build_armbian_rootfs_file.sh -v bookworm`
`16`	`16`	`#`
`17`	`17`	`#===================== Set make environment variables =====================`
`18`	`18`	`#`