root: fixed flatpak's unresponsive to 'any' value in OS/ARCH bug

It appears the flatpak packager is not responsive to 'any' value for OS/ARCH fields. Hence, we need to fix it. This patch fixes flatpak's unresponsiveness to 'any' value in OS/ARCH field bug. Co-authored-by: Shuralyov, Jean <jean.shuralyov@proton.me> Co-authored-by: Galyna, Cory <cory.galyna@gmail.com> Co-authored-by: (Holloway) Chew, Kean Ho <hollowaykeanho@gmail.com> Signed-off-by: (Holloway) Chew, Kean Ho <hollowaykeanho@gmail.com>
ChewKeanHo · May 21, 2024 · 36df3ec · 36df3ec
1 parent 35f510b
commit 36df3ec
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/automataCI/_package-flatpak_unix-any.sh b/automataCI/_package-flatpak_unix-any.sh
@@ -56,11 +56,11 @@ PACKAGE_Run_FLATPAK() {
         I18N_Check_Availability "FLATPAK"
         FLATPAK_Is_Available "$_target_os" "$_target_arch"
         case $? in
-        2|3)
+        2)
                 I18N_Check_Incompatible_Skipped
                 return 0
                 ;;
-        0)
+        0|3)
                 ;;
         *)
                 I18N_Check_Failed

diff --git a/automataCI/_package-flatpak_windows-any.ps1 b/automataCI/_package-flatpak_windows-any.ps1
@@ -46,10 +46,10 @@ function PACKAGE-Run-FLATPAK {
 	$null = I18N-Check-Availability "FLATPAK"
 	$___process = FLATPAK-Is-Available "${_target_os}" "${_target_arch}"
 	switch ($___process) {
-	{ $_ -in 2, 3 } {
+	2 {
 		$null = I18N-Check-Incompatible-Skipped
 		return 0
-	} 0 {
+	} { $_ -in 0, 3 } {
 		break
 	} Default {
 		$null = I18N-Check-Failed

diff --git a/automataCI/services/compilers/flatpak.ps1 b/automataCI/services/compilers/flatpak.ps1
@@ -132,7 +132,7 @@ function FLATPAK-Is-Available {
 
 	# check compatible target os
 	switch ($___os) {
-	linux {
+	{ $_ -in linux, any } {
 		# accepted
 	} Default {
 		return 2

diff --git a/automataCI/services/compilers/flatpak.sh b/automataCI/services/compilers/flatpak.sh
@@ -122,7 +122,7 @@ FLATPAK_Is_Available() {
 
         # check compatible target os
         case "$___os" in
-        linux)
+        linux|any)
                 # accepted
                 ;;
         *)

diff --git a/src/.ci/_package-flatpak_unix-any.sh b/src/.ci/_package-flatpak_unix-any.sh
@@ -63,7 +63,7 @@ PACKAGE_Assemble_FLATPAK_Content() {
                 return 10 # not applicable
         elif [ $(FS_Is_Target_A_PDF "$_target") -eq 0 ]; then
                 return 10 # not applicable
-        elif [ ! "$_target_os" = "linux" ]; then
+        elif [ ! "$_target_os" = "linux" ] && [ ! "$_target_os" = "any" ]; then
                 return 10 # not applicable
         fi
 

diff --git a/src/.ci/_package-flatpak_windows-any.ps1 b/src/.ci/_package-flatpak_windows-any.ps1
@@ -63,7 +63,7 @@ function PACKAGE-Assemble-FLATPAK-Content {
 		return 10 # not applicable
 	} elseif ($(FS-Is-Target-A-PDF "${_target}") -eq 0) {
 		return 10 # not applicable
-	} elseif ($_target_os -ne "linux") {
+	} elseif (($_target_os -ne "linux") -and ($_target_os -ne "any")) {
 		return 10 # not applicable
 	}