From f56168d4f2f8d0a7d66064127a4c84ea15b48d0c Mon Sep 17 00:00:00 2001 From: Oleg Skutte <00.00.oleg.00.00@gmail.com> Date: Sun, 20 Oct 2024 06:56:34 +0400 Subject: [PATCH] Remove ZipDLL --- .github/workflows/nsis-build.yml | 26 +++----------------------- README.md | 5 ++--- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/nsis-build.yml b/.github/workflows/nsis-build.yml index e1f66b7..2a48d38 100644 --- a/.github/workflows/nsis-build.yml +++ b/.github/workflows/nsis-build.yml @@ -15,11 +15,9 @@ jobs: - name: Install NSIS Plugins run: | - $ZipDLLUrl = "https://nsis.sourceforge.io/mediawiki/images/d/d9/ZipDLL.zip" $InetcUrl = "https://nsis.sourceforge.io/mediawiki/images/c/c9/Inetc.zip" $NsJSONUrl = "https://nsis.sourceforge.io/mediawiki/images/f/f0/NsJSON.zip" $NSISunzUUrl = "https://nsis.sourceforge.io/mediawiki/images/5/5a/NSISunzU.zip" - $ZipDLLPath = "$env:TEMP\ZipDLL.zip" $InetcPath = "$env:TEMP\Inetc.zip" $NsJSONPath = "$env:TEMP\NsJSON.zip" $NSISunzUPath = "$env:TEMP\NSISunzU.zip" @@ -28,30 +26,12 @@ jobs: $NSISPath = (Get-Command makensis.exe).Source | Split-Path -Parent Write-Host "NSIS installation path: $NSISPath" - # Download and install ZipDLL - try { - Invoke-WebRequest -Uri $ZipDLLUrl -OutFile $ZipDLLPath - Expand-Archive -Path $ZipDLLPath -DestinationPath "$env:TEMP\ZipDLL" -Force - } catch { - Write-Host "Error downloading or extracting ZipDLL: $_" - exit 1 - } - # Ensure directories exist $PluginsPath = Join-Path $NSISPath "Plugins" $IncludePath = Join-Path $NSISPath "Include" New-Item -ItemType Directory -Force -Path $PluginsPath | Out-Null New-Item -ItemType Directory -Force -Path $IncludePath | Out-Null - # Move ZipDLL files - try { - Move-Item -Path "$env:TEMP\ZipDLL\ZipDLL.dll" -Destination $PluginsPath -Force - Move-Item -Path "$env:TEMP\ZipDLL\ZipDLL.nsh" -Destination $IncludePath -Force - } catch { - Write-Host "Error moving ZipDLL files: $_" - exit 1 - } - # Download and install Inetc try { Invoke-WebRequest -Uri $InetcUrl -OutFile $InetcPath @@ -89,7 +69,7 @@ jobs: exit 1 } - Write-Host "ZipDLL, Inetc, NsJSON, and NSISunzU plugins installed successfully" + Write-Host "Inetc, NsJSON, and NSISunzU plugins installed successfully" - name: Build Installer run: | @@ -140,7 +120,7 @@ jobs: draft: false prerelease: false - - name: Upload Release Assets + - name: Upload Release Asset (EXE) if: github.event_name == 'push' && github.ref == 'refs/heads/master' uses: actions/upload-release-asset@v1 env: @@ -151,7 +131,7 @@ jobs: asset_name: DreamioInstaller.exe asset_content_type: application/vnd.microsoft.portable-executable - - name: Upload ZIP Release Asset + - name: Upload Release Asset (ZIP) if: github.event_name == 'push' && github.ref == 'refs/heads/master' uses: actions/upload-release-asset@v1 env: diff --git a/README.md b/README.md index 519ae98..5727a5f 100644 --- a/README.md +++ b/README.md @@ -21,18 +21,17 @@ To manually build the DREAMIO installer, follow these steps: 1. Install NSIS (Nullsoft Scriptable Install System) on your Windows machine. 2. Install the required NSIS plugins: - - ZipDLL - Inetc - NsJSON - NSISunzU - You can download these plugins from the NSIS website or use the URLs provided in the YAML file. + You can download these plugins from the NSIS website or use the URLs provided in the [YAML workflow file](.github/workflows/nsis-build.yml). 3. Place the plugin files in the appropriate NSIS directories: - `.dll` files go in the `Plugins` directory - `.nsh` files go in the `Include` directory -4. Open a command prompt and navigate to the directory containing the `script.nsi` file. +4. Clone the repository and navigate to the directory containing the `script.nsi` file. 5. Run the following command to build the installer: ```