Cleanup dependency arrays

openwrtbuilder

@@ -170,79 +170,79 @@ install_dependencies() {
 
   if ((FORCE_DEPENDS)) || [[ ! -f $lock_file ]]; then
     if ((FROM_SOURCE)); then
-      # For building from source code
+      # For building from source code see:
       # https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem
       case "$ID" in
         fedora|centos)
           pkg_list+=(
             bash-completion
             bzip2
+            clang # for qosify
+            diffutils
             gcc
             gcc-c++
             git
-            make
             libev-devel
-            pam-devel
             libtirpc-devel
-            xz-devel
-            net-snmp-devel
+            llvm15-libs
+            make
             ncurses-devel
+            net-snmp-devel
+            pam-devel
+            patch
             patch
-            rsync
-            tar
-            unzip
-            wget
-            which
-            diffutils
-            python3
-            python3-devel
-            python3-setuptools
-            python3-pyelftools
             perl
-            perl-base
             perl-Data-Dumper
             perl-File-Compare
             perl-File-Copy
             perl-FindBin
             perl-IPC-Cmd
+            perl-JSON-PP
             perl-Thread-Queue
             perl-Time-Piece
-            perl-JSON-PP
+            perl-base
+            python3
+            python3-devel
+            python3-pyelftools
+            python3-setuptools
+            rsync
             swig
-            clang # for qosify
-            llvm15-libs
-            patch)
-          ;;
+            tar
+            unzip
+            wget
+            which
+            xz-devel
+          ) ;;
         debian|ubuntu)
           pkg_list+=(
             build-essential
             clang
+            file
             flex
             g++
             gawk
             gcc-multilib
             gettext
             git
-            libncurses5-dev
-            libssl-dev
             libev-dev
-            libpam-dev
-            libtirpc-dev
             liblzma-dev
+            libncurses5-dev
+            libpam-dev
             libsnmp-dev
+            libssl-dev
+            libtirpc-dev
             python3-distutils
             rsync
+            patch
             unzip
-            zlib1g-dev
-            file
             wget
-            patch)
-          ;;
+            zlib1g-dev
+          ) ;;
         arch)
           pkg_list+=(
-            base-devel
             autoconf
             automake
+            base-devel
             bash
             binutils
             bison
@@ -261,8 +261,8 @@ install_dependencies() {
             gzip
             libelf
             libev
-            libtool
             libtirpc
+            libtool
             libxslt
             m4
             make
@@ -271,6 +271,7 @@ install_dependencies() {
             openssl
             pam
             patch
+            patch
             pkgconf
             python
             rsync
@@ -283,12 +284,8 @@ install_dependencies() {
             which
             xz
             zlib
-            patch)
-          ;;
-        *)
-          debug "Skipping dependency install, your OS is unsupported"
-          return 1
-          ;;
+          ) ;;
+        *) debug "Unsupported OS, skipping dependencies"; return 1 ;;
       esac
     else
       # For Imagebuilder