work-vol option to target different setup volume

Volume on which to store \setup.exe and \cygwin-packages
Volume on which to store \cygwin if install-dir param not specified

ref: cygwin#24

Signed-off-by: Glenn Strauss <[email protected]>

Author: gstrauss

README.md

@@ -22,13 +22,14 @@ Parameters
 | ------------------- | -------------------------------------------- | -----------
 | platform            | x86_64                                       | Install the x86 or x86\_64 version of Cygwin.
 | packages            | *none*                                       | List of additional packages to install.
-| install-dir         | C:\cygwin                                    | Installation directory
+| install-dir         | C:\cygwin                                    | Installation directory (path overrides work-vol for install-dir)
 | site                | http://mirrors.kernel.org/sourceware/cygwin/ | Mirror sites to install from, separated by whitespace
 | pubkeys             | *none*                                       | Absolute paths of extra public key files (RFC4880 format), separated by whitespace
 | check-sig           | true                                         | Whether to check the setup.ini signature
 | add-to-path         | true                                         | Whether to add Cygwin's `/bin` directory to the system `PATH`
 | allow-test-packages | false                                        | Consider package versions marked test for installation
 | check-hash          | true                                         | Whether to check the hash of the downloaded Cygwin installer.
+| work-vol            | C:                                           | Volume on which to store \setup.exe, \cygwin-packages, \cygwin.
 
 Line endings
 ------------

action.yml

@@ -12,9 +12,9 @@ inputs:
   install-dir:
     # by default, install to C:\cygwin rather than the platform dependent
     # default to make everything simpler
-    description: Installation directory
+    description: Installation directory (path overrides work-vol for install-dir)
     required: false
-    default: C:\cygwin
+    default: ''
   check-sig:
     description: Should the setup.ini file signature be checked?
     required: false
@@ -37,6 +37,10 @@ inputs:
     description: Check the hash of the installer
     required: false
     default: 'true'
+  work-vol:
+    description: Volume on which to store \setup.exe, \cygwin-packages, \cygwin
+    required: false
+    default: 'C:'
 
 runs:
   using: "composite"
@@ -51,9 +55,11 @@ runs:
           echo "unknown platform $platform"
           exit 1
         }
+        $vol = '${{ inputs.work-vol }}'
+        $setupExe = "$vol\setup.exe"
         $setupFileName = "setup-$platform.exe"
-        Invoke-WebRequest "https://cygwin.com/$setupFileName" -OutFile C:\setup.exe
-        if ((Get-Item -LiteralPath 'C:\setup.exe').Length -eq 0) {
+        Invoke-WebRequest "https://cygwin.com/$setupFileName" -OutFile $setupExe
+        if ((Get-Item -LiteralPath $setupExe).Length -eq 0) {
           throw "The downloaded setup has a zero length!"
         }
 
@@ -69,7 +75,7 @@ runs:
           if ($expectedHash -eq '') {
             Write-Output -InputObject "::warning::Unable to find the hash for the file $setupFileName in https://cygwin.com/sha512.sum"
           } else {
-            $actualHash = $(Get-FileHash -LiteralPath C:\setup.exe -Algorithm SHA512).Hash
+            $actualHash = $(Get-FileHash -LiteralPath $setupExe -Algorithm SHA512).Hash
             if ($actualHash -ine $expectedHash) {
               throw "Invalid hash of the downloaded setup!`nExpected: $expectedHash`nActual  : $actualHash"
             } else {
@@ -83,10 +89,14 @@ runs:
         $pkg_list = $pkg_list | % { $_.Trim() }
         $pkg_list = $pkg_list | % { $_.Trim(',') }
 
+        $installDir = '${{ inputs.install-dir }}'
+        if ($installDir -eq '') {
+          $installDir = "$vol\cygwin"
+        }
         $args = @(
          '-qnO',
-         '-l', 'C:\cygwin-packages',
-         '-R', '${{ inputs.install-dir }}'
+         '-l', "$vol\cygwin-packages",
+         '-R', "$installDir"
         )
 
         if ( '${{ inputs.allow-test-packages }}' -eq 'true' ) {
@@ -133,16 +143,25 @@ runs:
 
         # because setup is a Windows GUI app, make it part of a pipeline to make
         # PowerShell wait for it to exit
-        & C:\setup.exe $args | Out-Default
+        & $setupExe $args | Out-Default
       shell: powershell
 
     - if: ${{ inputs.add-to-path  == 'true' }}
-      run: echo "${{ inputs.install-dir }}\bin" >> $env:GITHUB_PATH
+      run: |
+        $installDir = '${{ inputs.install-dir }}'
+        if ($installDir -eq '') {
+          $installDir = '${{ inputs.work-vol }}\cygwin'
+        }
+        echo "$installDir\bin" >> $env:GITHUB_PATH
       shell: pwsh
 
     - run: |
         # run login shell to copy skeleton profile files
-        ${{ inputs.install-dir }}\bin\bash.exe --login
+        $installDir = '${{ inputs.install-dir }}'
+        if ($installDir -eq '') {
+          $installDir = '${{ inputs.work-vol }}\cygwin'
+        }
+        & "$installDir\bin\bash.exe" --login
       shell: pwsh
 
 branding: