Merge pull request #55 from uroesch/sync/update-2020-12-18

.github/workflows/build-package.yml

@@ -1,7 +1,7 @@
 # -----------------------------------------------------------------------------
 # Build workflow for portable apps
 # Author: Urs Roesch https://github.com/uroesch
-# Version: 0.6.0
+# Version: 0.7.0
 # -----------------------------------------------------------------------------
 name: build-package
 
@@ -32,7 +32,7 @@ jobs:
 
     steps:
     - name: Cache apt directory cache
-      if: runner.os == 'Linux'
+      if: runner.os == 'Linux' 
       uses: actions/cache@v2
       env:
         cache-name: cache-apt-pkgs
@@ -43,10 +43,17 @@ jobs:
     - name: Install Wine ~ hick ~
       if: runner.os == 'Linux'
       shell: bash
-      run: >
-        sudo dpkg --add-architecture i386 &&
-        sudo apt-get update &&
-        sudo apt-get -y install wine32
+      run: |2+
+        case $(lsb_release --short --release) in
+        20.04)          
+          sudo apt-get -y install wine
+          ;;
+        18.04)          
+          sudo dpkg --add-architecture i386 &&
+          sudo apt-get update &&
+          sudo apt-get -y install wine32
+          ;;
+        esac
 
     - name: Install Virtual Frame Buffer
       if: runner.os == 'Linux'

Other/Update/PortableAppsCommon.psm1

@@ -2,7 +2,7 @@
 # Description: Common classes and functions for portable apps powershell
 #   scripts
 # Author: Urs Roesch <github@bun.ch>
-# Version: 0.7.0
+# Version: 0.7.1
 # -----------------------------------------------------------------------------
 
 # -----------------------------------------------------------------------------
@@ -86,7 +86,7 @@ Class Download {
   }
 
   [string] Basename() {
-    $Elements = $This.URL.split('/')
+    $Elements = ($This.URL.split('?'))[0].split('/')
     $Basename = $Elements[$($Elements.Length-1)]
     return $Basename
   }
@@ -144,7 +144,7 @@ Function ConvertTo-WindowsPath() {
 # -----------------------------------------------------------------------------
 Function Switch-Path() {
   # Convert Path only Works on Existing Directories :(
-  param( [string] $Path )
+  Param( [string] $Path )
   Switch (Test-Unix) {
     $True {
       $From = '\'