fixup!!! JBR-6181 add Linux executables with bundled FreeType

jb/project/tools/common/scripts/common.sh

@@ -5,11 +5,11 @@ set -x
 
 function check_bundle_type_maketest() {
   # check whether last char is 't', if so remove it
-  if [ "${bundle_type: -1}" == "t" && "${bundle_type: -2}" == "ft" ]; then
+  if [ "${bundle_type: -1}" == "t" ] && [ "${bundle_type: -2}" == "ft" ]; then
+    do_maketest=0
+  else
     bundle_type="${bundle_type%?}"
     do_maketest=1
-  else
-    do_maketest=0
   fi
 }
 

jb/project/tools/linux/scripts/mkimages_aarch64.sh

@@ -66,7 +66,6 @@ function create_image_bundle {
   JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number}
 
-
   echo Running jlink....
   [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
   $JSDK/bin/jlink \
@@ -106,13 +105,18 @@ jbr_name_postfix=""
 case "$bundle_type" in
   "jcef")
     do_reset_changes=1
+    jbr_name_postfix="_${bundle_type}"
     do_maketest=1
     ;;
   "nomod" | "")
     bundle_type=""
     ;;
+  "nomodft" | "")
+    jbr_name_postfix="_ft"
+    ;;
   "fd")
     do_reset_changes=1
+    jbr_name_postfix="_${bundle_type}"
     WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
     RELEASE_NAME=linux-aarch64-server-fastdebug
     ;;
@@ -136,11 +140,7 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
   git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
   update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
   cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
-
-  jbr_name_postfix="_${bundle_type}"
   cat $JCEF_PATH/jcef.version >> $JSDK/release
-else
-  jbr_name_postfix=""
 fi
 
 # create runtime image bundle

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -112,7 +112,6 @@ case "$bundle_type" in
     bundle_type=""
     ;;
   "nomodft" | "")
-    bundle_type=""
     jbr_name_postfix="_ft"
     ;;
   "fd")