diff --git a/.github/workflows/scripts/generate-app-headers.sh b/.github/workflows/scripts/generate-app-headers.sh index e9674491b..07db22da8 100755 --- a/.github/workflows/scripts/generate-app-headers.sh +++ b/.github/workflows/scripts/generate-app-headers.sh @@ -22,7 +22,9 @@ generate_headers() { for script in "${file_list[@]}"; do [[ -f "$script" ]] || continue - app_name=$(grep -oP '^APP="\K[^"]+' "$script" 2>/dev/null) + # -m1: a script that sets APP twice (the second carrying ${var_version}) + # otherwise yields both lines, and the filename gets a newline in it. + app_name=$(grep -m1 -oP '^APP="\K[^"]+' "$script" 2>/dev/null) if [[ -n "$app_name" ]]; then # core.func/vm-core.func look the header up as "${APP,,}" without spaces, # so the generated file has to be named after APP - not after the script. diff --git "a/vm/headers/almalinux\nalmalinux${var_version}vm" "b/vm/headers/almalinux\nalmalinux${var_version}vm" deleted file mode 100644 index 051b365f5..000000000 --- "a/vm/headers/almalinux\nalmalinux${var_version}vm" +++ /dev/null @@ -1,12 +0,0 @@ - ___ __ __ _ - / | / /___ ___ ____ _/ / (_)___ __ ___ __ - / /| | / / __ `__ \/ __ `/ / / / __ \/ / / / |/_/ - / ___ |/ / / / / / / /_/ / /___/ / / / / /_/ /> < -/_/ |_/_/_/ /_/ /_/\__,_/_____/_/_/ /_/\__,_/_/|_| - - ___ __ __ _ __ __ _ _ _ ____ ___ - / | / /___ ___ ____ _/ / (_)___ __ ___ __ _/ / _/_/ ______ _______ _____ __________(_)___ ____ | | | | / / |/ / - / /| | / / __ `__ \/ __ `/ / / / __ \/ / / / |/_/ / __//_/| | / / __ `/ ___/ | / / _ \/ ___/ ___/ / __ \/ __ \ / / | | / / /|_/ / - / ___ |/ / / / / / / /_/ / /___/ / / / / /_/ /> < (_ < < | |/ / /_/ / / | |/ / __/ / (__ ) / /_/ / / / /_>_> | |/ / / / / -/_/ |_/_/_/ /_/ /_/\__,_/_____/_/_/ /_/\__,_/_/|_| / _// / |___/\__,_/_/____|___/\___/_/ /____/_/\____/_/ /_//_/ |___/_/ /_/ - /_/ \_\ /_____/ /_/ diff --git "a/vm/headers/debian\ndebian${var_version}" "b/vm/headers/debian\ndebian${var_version}" deleted file mode 100644 index 15defbafb..000000000 --- "a/vm/headers/debian\ndebian${var_version}" +++ /dev/null @@ -1,12 +0,0 @@ - ____ __ _ - / __ \___ / /_ (_)___ _____ - / / / / _ \/ __ \/ / __ `/ __ \ - / /_/ / __/ /_/ / / /_/ / / / / -/_____/\___/_.___/_/\__,_/_/ /_/ - - ____ __ _ __ __ _ _ - / __ \___ / /_ (_)___ _____ _/ / _/_/ ______ _______ _____ __________(_)___ ____ | | - / / / / _ \/ __ \/ / __ `/ __ \ / __//_/| | / / __ `/ ___/ | / / _ \/ ___/ ___/ / __ \/ __ \ / / - / /_/ / __/ /_/ / / /_/ / / / / (_ < < | |/ / /_/ / / | |/ / __/ / (__ ) / /_/ / / / /_>_> -/_____/\___/_.___/_/\__,_/_/ /_/ / _// / |___/\__,_/_/____|___/\___/_/ /____/_/\____/_/ /_//_/ - /_/ \_\ /_____/ /_/ diff --git "a/vm/headers/ubuntu\nubuntu${var_version}vm" "b/vm/headers/ubuntu\nubuntu${var_version}vm" deleted file mode 100644 index e2e772460..000000000 --- "a/vm/headers/ubuntu\nubuntu${var_version}vm" +++ /dev/null @@ -1,12 +0,0 @@ - __ ____ __ - / / / / /_ __ ______ / /___ __ - / / / / __ \/ / / / __ \/ __/ / / / -/ /_/ / /_/ / /_/ / / / / /_/ /_/ / -\____/_.___/\__,_/_/ /_/\__/\__,_/ - - __ ____ __ __ __ _ _ _ ____ ___ - / / / / /_ __ ______ / /___ __ _/ / _/_/ ______ _______ _____ __________(_)___ ____ | | | | / / |/ / - / / / / __ \/ / / / __ \/ __/ / / / / __//_/| | / / __ `/ ___/ | / / _ \/ ___/ ___/ / __ \/ __ \ / / | | / / /|_/ / -/ /_/ / /_/ / /_/ / / / / /_/ /_/ / (_ < < | |/ / /_/ / / | |/ / __/ / (__ ) / /_/ / / / /_>_> | |/ / / / / -\____/_.___/\__,_/_/ /_/\__/\__,_/ / _// / |___/\__,_/_/____|___/\___/_/ /____/_/\____/_/ /_//_/ |___/_/ /_/ - /_/ \_\ /_____/ /_/