Improve setup script for for ArchLinux

Author: halx99

1k/1kiss.ps1

@@ -1167,7 +1167,7 @@ function setup_nasm() {
             $1k.addpath($nasm_bin)
         }
         elseif ($IsLinux) {
-            if ($(which dpkg)) {
+            if (Get-Command dpkg -ErrorAction SilentlyContinue) {
                 sudo apt-get install -y nasm
             }
         }
@@ -1215,10 +1215,10 @@ function setup_unzip() {
     $unzip_cmd_info = Get-Command 'unzip' -ErrorAction SilentlyContinue
     if (!$unzip_cmd_info) {
         if ($IsLinux) {
-            if ($(which dpkg)) {
+            if (Get-Command dpkg -ErrorAction SilentlyContinue) {
                 sudo apt-get install -y unzip
             }
-            elseif ($(which pacman)) {
+            elseif (Get-Command pacman -ErrorAction SilentlyContinue) {
                 sudo pacman -S --needed --noconfirm unzip
             }
             else {
@@ -1250,7 +1250,7 @@ function setup_7z() {
             $1k.addpath($7z_bin)
         }
         elseif ($IsLinux) {
-            if ($(which dpkg)) { sudo apt-get install -y p7zip-full }
+            if ($(Get-Command dpkg -ErrorAction SilentlyContinue)) { sudo apt-get install -y p7zip-full }
         }
         elseif ($IsMacOS) {
             brew install p7zip

1k/pwshi.sh

@@ -64,10 +64,10 @@ if [ $HOST_OS = 'Darwin' ] ; then
     sudo installer -pkg "$pwsh_pkg_out" -target /
 elif [ $HOST_OS = 'Linux' ] ; then
     distro=$(grep -oP '(?<=^ID=).+' /etc/os-release | tr -d '"')
+    sudo_cmd=$(command -v sudo)
     if command -v dpkg > /dev/null; then  # Linux distro: deb (ubuntu)
         check_pwsh $pwsh_min_ver $pwsh_ver
 
-        sudo_cmd=$(which sudo)
         if ! command -v curl >/dev/null 2>&1; then
             $sudo_cmd apt-get update
             $sudo_cmd apt-get install -y curl
@@ -150,14 +150,6 @@ elif [ $HOST_OS = 'Linux' ] ; then
         # install powershell
         $sudo_cmd dpkg -i "$pwsh_pkg_out"
         $sudo_cmd apt install -f --allow-unauthenticated --yes powershell
-    elif command -v pacman > /dev/null; then # Linux distro: Arch
-        # refer: https://ephos.github.io/posts/2018-9-17-Pwsh-ArchLinux
-        # available pwsh version, refer to: https://aur.archlinux.org/packages/powershell-bin
-        check_pwsh $pwsh_min_ver
-        git clone https://aur.archlinux.org/powershell-bin.git $cacheDir/powershell-bin
-        cd $cacheDir/powershell-bin
-        makepkg -si --needed --noconfirm
-        cd -
     else
         # install generic edition from tar package for other linux distro manually
         check_pwsh $pwsh_min_ver $pwsh_ver
@@ -173,7 +165,7 @@ elif [ $HOST_OS = 'Linux' ] ; then
             tar xvf $pwsh_pkg_out -C "$pwsh_inst_dir"
         fi
         chmod +x "$pwsh_path"
-        sudo ln -s "$pwsh_path" /usr/local/bin/pwsh
+        $sudo_cmd ln -s "$pwsh_path" /usr/local/bin/pwsh
     fi
 else
     echo "pwshi: Unsupported HOST OS: $HOST_OS"

setup.ps1

@@ -370,7 +370,7 @@ else {
                     Write-Host "Are want add tsinghua mirror for speed up package install in china region? (y/N)" -NoNewline
                     $answer = Read-Host
                     if ($answer -like 'y*') {
-                        $mirror_list = "$tsinghua_mirror`n$mirror_list"
+                        $mirror_list = "Server = $tsinghua_mirror`n$mirror_list"
                         $mirror_list_tmp_file = (Join-Path $AX_ROOT 'mirrorlist')
                         [System.IO.File]::WriteAllText($mirror_list_tmp_file, $mirror_list)
                         sudo mv -f $mirror_list_tmp_file /etc/pacman.d/mirrorlist
@@ -379,7 +379,10 @@ else {
                 }
 
                 $DEPENDS = @(
+                    'gcc',
                     'git',
+                    'less', # for git diff
+                    'pkgconf',
                     'cmake',
                     'make',
                     'libx11',
@@ -389,12 +392,16 @@ else {
                     'libxi',
                     'fontconfig',
                     'gtk3',
-                    'webkit2gtk',
                     'vlc',
                     'wayland',
                     'wayland-protocols',
                     'libglvnd'
                 )
+
+                if ($(pacman -Si webkit2gtk -q 2>$null)) {
+                    $DEPENDS += 'webkit2gtk'
+                }
+
                 sudo pacman -S --needed --noconfirm @DEPENDS
             }
             elseif($LinuxDistro -eq 'fedora') {