DEB is generating linux-any which is supposedly be any

[hollowaykeanho]

Description

DEB package is default to linux so the OS is omitted. Otherwise, dpkg -i will fail. Hence, this requires update.

Expected Behavior

DEB package generates the arch naming convention for linux OS.

Current Behavior

DEB package generates the os-arch naming convention for linux OS.

Steps to Reproduce [COMPULSORY]

1. deploy AutomataCI version v2.1.0.
2. build + package.
3. Attempt to install using dpkg -i.

Associated Data Files

No response

[hollowaykeanho]

Fix:

diff --git a/automataCI/services/compilers/deb.ps1 b/automataCI/services/compilers/deb.ps1
index b3b9ab8..e33b037 100644
--- a/automataCI/services/compilers/deb.ps1
+++ b/automataCI/services/compilers/deb.ps1
@@ -400,35 +400,37 @@ function DEB-Get-Architecture {
 
        # process os
        switch ($___os) {
-       "dragonfly" {
-               $___output="dragonflybsd"
+       } "dragonfly" {
+               $___output="dragonflybsd-"
+       "linux" {
+               $___output=""
        } default {
-               $___output="${___os}"
+               $___output="${___os}-"
        }}
 
 
        # process arch
        switch ($___arch) {
        { $_ -in "386", "i386", "486", "i486", "586", "i586", "686", "i686" } {
-               $___output = "${___output}-i386"
+               $___output = "${___output}i386"
        } "mipsle" {
-               $___output = "${___output}-mipsel"
+               $___output = "${___output}mipsel"
        } "mipsr6le" {
-               $___output = "${___output}-mipsr6el"
+               $___output = "${___output}mipsr6el"
        } "mips32le" {
-               $___output = "${___output}-mips32el"
+               $___output = "${___output}mips32el"
        } "mips32r6le" {
-               $___output = "${___output}-mips32r6el"
-               $___output = "${___output}-mips32r6el"
+               $___output = "${___output}mips32r6el"
        } "mips64le" {
-               $___output = "${___output}-mips64el"
+               $___output = "${___output}mips64el"
        } "mips64r6le" {
-               $___output = "${___output}-mips64r6el"
+               $___output = "${___output}mips64r6el"
        } "powerpcle" {
-               $___output = "${___output}-powerpcel"
+               $___output = "${___output}powerpcel"
        } "ppc64le" {
-               $___output = "${___output}-ppc64el"
+               $___output = "${___output}ppc64el"
        } default {
-               $___output = "${___output}-${___arch}"
+               $___output = "${___output}${___arch}"
        }}
 
 
diff --git a/automataCI/services/compilers/deb.sh b/automataCI/services/compilers/deb.sh
index 771d280..62b088e 100644
--- a/automataCI/services/compilers/deb.sh
+++ b/automataCI/services/compilers/deb.sh
@@ -384,11 +384,14 @@ DEB_Get_Architecture() {
 
         # process os
         case "$1" in
+        linux)
+                ___output=""
+                ;;
         dragonfly)
-                ___output="dragonflybsd"
+                ___output="dragonflybsd-"
                 ;;
         *)
-                ___output="$1"
+                ___output="${1}-"
                 ;;
         esac
 
@@ -396,34 +399,34 @@ DEB_Get_Architecture() {
         # process arch
         case "$2" in
         386|i386|486|i486|586|i586|686|i686)
-                ___output="${___output}-i386"
+                ___output="${___output}i386"
                 ;;
         mipsle)
-                ___output="${___output}-mipsel"
+                ___output="${___output}mipsel"
                 ;;
         mipsr6le)
-                ___output="${___output}-mipsr6el"
+                ___output="${___output}mipsr6el"
                 ;;
         mips32le)
-                ___output="${___output}-mips32el"
+                ___output="${___output}mips32el"
                 ;;
         mips32r6le)
-                ___output="${___output}-mips32r6el"
+                ___output="${___output}mips32r6el"
                 ;;
         mips64le)
-                ___output="${___output}-mips64el"
+                ___output="${___output}mips64el"
                 ;;
         mips64r6le)
-                ___output="${___output}-mips64r6el"
+                ___output="${___output}mips64r6el"
                 ;;
         powerpcle)
-                ___output="${___output}-powerpcel"
+                ___output="${___output}powerpcel"
                 ;;
         ppc64le)
-                ___output="${___output}-ppc64el"
+                ___output="${___output}ppc64el"
                 ;;
         *)
-                ___output="${___output}-${2}"
+                ___output="${___output}${2}"
                 ;;
         esac
 

[hollowaykeanho]

implemented in 2f63fcb