From 8cff8b1f018a46e41d7b91dcfa09a35842814d5f Mon Sep 17 00:00:00 2001 From: builder555 <85308587+builder555@users.noreply.github.com> Date: Fri, 26 Jan 2024 23:08:06 -0500 Subject: [PATCH] fix: start.ps1 causes more problems than it solves --- Readme.md | 8 +++----- ci/package.ps1 | 3 --- ci/start.ps1 | 10 ---------- docs/install-guide/easy-install.md | 19 +++---------------- 4 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 ci/start.ps1 diff --git a/Readme.md b/Readme.md index 478bdd40..94afd741 100644 --- a/Readme.md +++ b/Readme.md @@ -63,11 +63,9 @@ Why focus on soldering when you can play with the settings instead? With this ap 4. **Windows**: * right click on the zip, properties> general, check box to Unblock, then extract ([reference](https://github.com/builder555/PineSAM/discussions/106#discussion-4960445)). - * Run [powershell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.3) as admin, cd to the pinesam folder and `.\start.ps1` - * Allow any windows pop-up warnings about "serve.exe" and "main_sever.exe". - * If you get errors in powershell, set the permissions to RemoteSigned to allow scripts ([reference](https://lazyadmin.nl/powershell/running-scripts-is-disabled-on-this-system/)). - * ```C:\> Set-ExecutionPolicy RemoteSigned``` - * Browser will automatically open http://localhost:8080 + * Run `Pinesam.exe` + * Approve any pop-up warnings. + * Open http://localhost:8080 in your normal browser (the page will not open automatically). * Usage guide [here](https://builder555.github.io/PineSAM/user-guide/usage/). ## II. Build the Dev version (Source-all-_.zip) diff --git a/ci/package.ps1 b/ci/package.ps1 index 4ec20952..87084ad3 100755 --- a/ci/package.ps1 +++ b/ci/package.ps1 @@ -11,8 +11,5 @@ Push-Location dist Compress-Archive -Path Pinecil.exe -DestinationPath $zip_path -Force Pop-Location -Compress-Archive -Update ci/start.ps1 $zip_path -Compress-Archive -Update version.txt $zip_path - Write-Output "asset_path=$zip_path" >> $Env:GITHUB_OUTPUT Write-Output "asset_name=${name}.zip" >> $Env:GITHUB_OUTPUT \ No newline at end of file diff --git a/ci/start.ps1 b/ci/start.ps1 deleted file mode 100644 index f9cd48d3..00000000 --- a/ci/start.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -$process1 = Start-Process .\Pinecil.exe -PassThru - -$pid1 = $process1.Id - -Write-Output "Pinecil process ID: $pid1" - -Start-Sleep -Seconds 5 -Start-Process "http://localhost:8080/" - -Get-Process -Id $pid1 | Wait-Process diff --git a/docs/install-guide/easy-install.md b/docs/install-guide/easy-install.md index 2a35ccd9..31a4351a 100644 --- a/docs/install-guide/easy-install.md +++ b/docs/install-guide/easy-install.md @@ -24,26 +24,13 @@ Just download the latest [release](https://github.com/builder555/PineSAM/release * Download the zip for Windows from [here](https://github.com/builder555/PineSAM/releases/latest). * Right-click the zip > properties, if it has an Unblock option, then unblock and extract the zip ([reference](https://github.com/builder555/PineSAM/discussions/106#discussion-4960445)). -* Inside powershell, change to the directory where the files were extracted. +* Run `Pinesam.exe`. -``` console title="Run powershell, path may differ from example" -C:\> cd .\Downloads\PineSAM\ -C:\> .\start.ps1 -``` - -* Accept any pop-up warnings about "serve.exe" and "main_sever.exe" ([reference](https://github.com/builder555/PineSAM/discussions/106#discussion-4960445)). +* Accept any pop-up warnings ([reference](https://github.com/builder555/PineSAM/discussions/106#discussion-4960445)). -* Your default browser will automatically open http://localhost:8080 +* Open http://localhost:8080 in your normal browser (the page will not open automatically). * To run from a phone [see :material-cellphone-nfc:](../index.md#remote-access) * User [guide here](../user-guide/usage.md).
-* If there are errors, run [Powershell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.3) as administrator. - -* Then use this command to set permissions to `RemoteSigned` to allow pwsh to execute scripts ([reference](https://lazyadmin.nl/powershell/running-scripts-is-disabled-on-this-system/)). - -``` console -C:\> Set-ExecutionPolicy RemoteSigned -``` - * See [Troubleshooting](troubleshooting.md) for help. \ No newline at end of file