From d592d338df681e176aeece5ee1ebd596b38696d6 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Mon, 23 Oct 2023 16:45:33 +0000 Subject: [PATCH] chore(windows): remove .bat cruft --- _webi/bootstrap.bat | 28 ---------------------------- _webi/releases.js | 40 ---------------------------------------- _webi/serve-installer.js | 3 --- _webi/template.bat | 5 ----- caddy/README.md | 2 +- node/install.bat | 23 ----------------------- webi/install.bat | 1 - 7 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 _webi/bootstrap.bat delete mode 100644 _webi/template.bat delete mode 100644 node/install.bat delete mode 100644 webi/install.bat diff --git a/_webi/bootstrap.bat b/_webi/bootstrap.bat deleted file mode 100644 index 495a624..0000000 --- a/_webi/bootstrap.bat +++ /dev/null @@ -1,28 +0,0 @@ -setlocal -@echo off -pushd "%userprofile%" || goto :error - IF NOT EXIST .local ( - mkdir .local || goto :error - ) - IF NOT EXIST .local\bin ( - mkdir .local\bin || goto :error - ) - - rem {{ baseurl }} - rem {{ version }} - pushd .local\bin || goto :error - if NOT EXIST webi.bat ( - rem without SilentlyContinue this is SLOOOOOOOOOOOOOOOW! - powershell $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest https://webinstall.dev/packages/_webi/webi.bat -OutFile webi.bat || goto :error - ) - call .\webi {{ exename }} || goto :error - rem pathman add "%userprofile%\.local\bin" >nul 2>&1 || goto :error - pathman add "%userprofile%\.local\bin" || goto :error - popd || goto :error -popd - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/_webi/releases.js b/_webi/releases.js index 707efcf..074abd6 100644 --- a/_webi/releases.js +++ b/_webi/releases.js @@ -156,46 +156,6 @@ Releases.renderBash = async function ( }); }; -Releases.renderBatch = async function ( - pkgdir, - rel, - { baseurl, pkg, tag, ver, os, arch, formats }, -) { - if (!Array.isArray(formats)) { - formats = []; - } - if (!tag) { - tag = ''; - } - return fs.promises - .readFile(path.join(pkgdir, 'install.bat'), 'utf8') - .then(function (installTxt) { - installTxt = padScript(installTxt); - /* - var vers = rel.version.split('.'); - var v = { - major: vers.shift() || '', - minor: vers.shift() || '', - patch: vers.join('.').replace(/[+\-].*$/, ''), - build: vers - .join('.') - .replace(/[^+\-]*()/, '') - .replace(/^-/, '') - }; - */ - return fs.promises - .readFile(path.join(__dirname, 'template.bat'), 'utf8') - .then(function (tplTxt) { - return tplTxt - .replace( - /^(REM )?WEBI_PKG=.*/im, - "WEBI_PKG='" + pkg + '@' + ver + "'", - ) - .replace(reInstallTpl, '\n' + installTxt); - }); - }); -}; - Releases.renderPowerShell = async function ( pkgdir, rel, diff --git a/_webi/serve-installer.js b/_webi/serve-installer.js index 6aa3bb8..ba72d27 100644 --- a/_webi/serve-installer.js +++ b/_webi/serve-installer.js @@ -79,9 +79,6 @@ async function serveInstaller(baseurl, ua, pkg, tag, ext, formats) { rel.arches = rels.arches; rel.formats = rels.formats; - if ('bat' === ext) { - return Releases.renderBatch(pkgdir, rel, opts); - } if ('ps1' === ext) { return Releases.renderPowerShell(pkgdir, rel, opts); } diff --git a/_webi/template.bat b/_webi/template.bat deleted file mode 100644 index 8b9d43b..0000000 --- a/_webi/template.bat +++ /dev/null @@ -1,5 +0,0 @@ -REM REM debug - -REM WEBI_PKG= - -{{ installer }} diff --git a/caddy/README.md b/caddy/README.md index 22b4c11..87c6d30 100644 --- a/caddy/README.md +++ b/caddy/README.md @@ -851,7 +851,7 @@ sudo serviceman add --system --name caddy -- \ ``` 2. Install [`serviceman`](../serviceman/) ```sh - webi.bat serviceman + webi serviceman ``` 3. Create a **Startup Registry Entry** with Serviceman. ```sh diff --git a/node/install.bat b/node/install.bat deleted file mode 100644 index b8ef142..0000000 --- a/node/install.bat +++ /dev/null @@ -1,23 +0,0 @@ -@echo off -setlocal -pushd "%userprofile%" || goto :error - pushd "%userprofile%\.local\opt" || goto :error - powershell $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest https://nodejs.org/dist/v12.16.2/node-v12.16.2-win-x64.zip -OutFile node-v12.16.2-win-x64.zip || goto :error - rem Windows BSD-tar handles zip. Imagine that. - tar xf node-v12.16.2-win-x64.zip || goto :error - dir - rename node-v12.16.2-win-x64 node-v12.16.2 || goto :error - rmdir node-v12.16.2-win-x64 - del node-v12.16.2-win-x64.zip || goto :error - popd || goto :error - - rem make npm not act stupid about which node to use... ugh (this should be the default) - .\.local\opt\node-v12.16.2\npm.cmd" --scripts-prepend-node-path=true config set scripts-prepend-node-path true || goto :error - pathman add .local\opt\node-v12.16.2 || goto :error -popd || goto :error - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/webi/install.bat b/webi/install.bat deleted file mode 100644 index d93a782..0000000 --- a/webi/install.bat +++ /dev/null @@ -1 +0,0 @@ -rem do nothing because this is a special case