Start support to variant with unmodified file name, start adding support for raspios64

Author: shapedo

src/modules/base/config

@@ -19,6 +19,8 @@ if [ "${BASE_DISTRO}" == "ubuntu" ]; then
   [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/ubuntu-*.xz | head -n 1`
   # Default user ubuntu
   [ -n "$BASE_USER" ] || BASE_USER=ubuntu
+elif [ "${BASE_DISTRO}" == "raspios64" ]; then
+  [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}-*-arm64-*.zip | head -n 1`
 else
   # Default image raspbian
   [ -n "$BASE_ZIP_IMG" ] || BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}*.zip | head -n 1`
@@ -81,3 +83,6 @@ fi
 # Arch for now either armv7l, arm64 or aarch64
 [ -n "$BASE_ARCH" ] || BASE_ARCH=armv7l
 
+# If you want your variant not to have the name appending, enable this
+[ -n "$BASE_IGNORE_VARIANT_NAME" ] || BASE_IGNORE_VARIANT_NAME=no
+

src/release

@@ -25,8 +25,8 @@ if [ "${BASE_RELEASE_IMG_NAME}" == "default" ]; then
     # Handle variant name
     for CHANGE_STRING in "${CHANGE_STRING_LIST[@]}"
     do
-        if [ -z "$1" ];then
-        IMG_FILENAME=$(echo "${FILENAME::-4}"-"${DIST_VERSION}" | sed "s/${CHANGE_STRING}/${DIST_NAME,,}/").img
+        if [ -z "$1" ] || [ "$BASE_IGNORE_VARIANT_NAME" == "yes" ] ;then
+            IMG_FILENAME=$(echo "${FILENAME::-4}"-"${DIST_VERSION}" | sed "s/${CHANGE_STRING}/${DIST_NAME,,}/").img
         else
             IMG_FILENAME=$(echo "${FILENAME::-4}"-"${DIST_VERSION}" | sed "s/${CHANGE_STRING}/${DIST_NAME,,}-$1/").img
         fi