burn the logs and use 'install.bash'
authorAJ ONeal <aj@therootcompany.com>
Wed, 6 May 2020 03:28:55 +0000 (03:28 +0000)
committerAJ ONeal <aj@therootcompany.com>
Wed, 6 May 2020 03:28:55 +0000 (03:28 +0000)
41 files changed:
_common/gitea.js
_common/github.js
_common/normalize.js
brew/brew.bash [deleted file]
brew/install.bash [new file with mode: 0644]
caddy/caddy.bash [deleted file]
caddy/install.bash [new file with mode: 0644]
caddy/releases.js
flutter/flutter.bash [deleted file]
flutter/install.bash [new file with mode: 0644]
flutter/releases.js
go/go.bash [deleted file]
go/install.bash [new file with mode: 0644]
golang/golang.bash [deleted file]
golang/install.bash [new file with mode: 0644]
golang/releases.js
macos/install.bash [new file with mode: 0644]
macos/macos.bash [deleted file]
macos/releases.js
node/install.bash [new file with mode: 0644]
node/node.bash [deleted file]
node/releases.js
pathman/install.bash [new file with mode: 0644]
pathman/pathman.bash [deleted file]
pathman/releases.js
rg/install.bash [new file with mode: 0644]
rg/releases.js
rg/rg.bash [deleted file]
ripgrep/install.bash [new file with mode: 0644]
ripgrep/releases.js
ripgrep/ripgrep.bash [deleted file]
rust/install.bash [new file with mode: 0644]
rust/rust.bash [deleted file]
rustlang/install.bash [new file with mode: 0644]
rustlang/rustlang.bash [deleted file]
serviceman/install.bash [new file with mode: 0644]
serviceman/serviceman.bash [deleted file]
vim-sensible/install.bash [new file with mode: 0644]
vim-sensible/vim-sensible.bash [deleted file]
webi/install.bash [new file with mode: 0644]
webi/webi.bash [deleted file]

index c0deae379462fcc9bea388c3b998ae7a257ddf83..d6fe53750eb18be63e80d417d9280e225792f507 100644 (file)
@@ -33,7 +33,7 @@ if (module === require.main) {
   ).then(
     //getAllReleases(require('@root/request'), 'root', 'serviceman', 'https://git.rootprojects.org').then(
     function (all) {
-      console.log(JSON.stringify(all, null, 2));
+      console.info(JSON.stringify(all, null, 2));
     }
   );
 }
index ef3a64fa5222a423d1ebd998cccdaae1fb9e4fe5..442b16b0b82534fc7aea8399e3718d388f8641c5 100644 (file)
@@ -58,7 +58,7 @@ module.exports = getAllReleases;
 if (module === require.main) {
   getAllReleases(require('@root/request'), 'BurntSushi', 'ripgrep').then(
     function (all) {
-      console.log(JSON.stringify(all, null, 2));
+      console.info(JSON.stringify(all, null, 2));
     }
   );
 }
index 0f28e238c391c707652fe399ea5cc15a4cc7be62..dac09020a7f4473ebfd917ecf3144bb3a0ac1791 100644 (file)
@@ -42,8 +42,7 @@ function normalize(all) {
     if (!rel.os) {
       rel.os =
         Object.keys(osMap).find(function (regKey) {
-          /*
-          console.log(
+          /* console.log(
             'release os:',
             regKey,
             osMap[regKey],
diff --git a/brew/brew.bash b/brew/brew.bash
deleted file mode 100644 (file)
index e95a572..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# title: Homebrew
-# homepage: https://brew.sh
-# tagline: The Missing Package Manager for macOS (or Linux)
-# description: |
-#   Homebrew installs the stuff you need that Apple (or your Linux system) didn’t.
-# examples: |
-#   ```bash
-#   brew install node
-#   ```
-
-# Straight from https://brew.sh
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
diff --git a/brew/install.bash b/brew/install.bash
new file mode 100644 (file)
index 0000000..e95a572
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# title: Homebrew
+# homepage: https://brew.sh
+# tagline: The Missing Package Manager for macOS (or Linux)
+# description: |
+#   Homebrew installs the stuff you need that Apple (or your Linux system) didn’t.
+# examples: |
+#   ```bash
+#   brew install node
+#   ```
+
+# Straight from https://brew.sh
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
diff --git a/caddy/caddy.bash b/caddy/caddy.bash
deleted file mode 100644 (file)
index 8540687..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# title: Caddy
-# homepage: https://github.com/caddyserver/caddy
-# tagline: Fast, multi-platform web server with automatic HTTPS
-# description: |
-# Caddy is an extensible server platform that uses TLS by default.
-# examples: |
-#   ```bash
-#   caddy start
-#   ```
-
-set -e
-set -u
-
-#################
-# Install caddy #
-#################
-
-new_caddy="${HOME}/.local/bin/caddy"
-
-# Test for existing version
-set +e
-cur_caddy="$(command -v caddy)"
-set -e
-if [ -n "$cur_caddy" ]; then
-  cur_ver=$(caddy version | head -n 1 | cut -d ' ' -f 2)
-  if [ "$cur_ver" == "$WEBI_VERSION" ]; then
-    echo "caddy v$WEBI_VERSION already installed at $cur_caddy"
-    exit 0
-  elif [ "$cur_caddy" != "$new_caddy" ]; then
-    echo "WARN: possible conflict with caddy v$WEBI_VERSION at $cur_caddy"
-  fi
-fi
-
-# Note: this file is `source`d by the true installer and hence will have the webi functions
-
-# because we created releases.js we can use webi_download()
-# downloads caddy to ~/Downloads
-webi_download
-
-# because this is tar or zip, we can webi_extract()
-# extracts to the WEBI_TMP directory, raw (no --strip-prefix)
-webi_extract
-
-pushd "$WEBI_TMP" 2>&1 >/dev/null
-        echo Installing caddy v${WEBI_VERSION} as "$new_caddy"
-        mv ./caddy "$HOME/.local/bin/"
-popd 2>&1 >/dev/null
-
-###################
-#   Update PATH   #
-###################
-
-# TODO get better output from pathman / output the path to add as return to webi bootstrap
-webi_path_add "$HOME/.local/bin"
-
-echo "Installed 'caddy'"
-echo ""
diff --git a/caddy/install.bash b/caddy/install.bash
new file mode 100644 (file)
index 0000000..8540687
--- /dev/null
@@ -0,0 +1,57 @@
+# title: Caddy
+# homepage: https://github.com/caddyserver/caddy
+# tagline: Fast, multi-platform web server with automatic HTTPS
+# description: |
+# Caddy is an extensible server platform that uses TLS by default.
+# examples: |
+#   ```bash
+#   caddy start
+#   ```
+
+set -e
+set -u
+
+#################
+# Install caddy #
+#################
+
+new_caddy="${HOME}/.local/bin/caddy"
+
+# Test for existing version
+set +e
+cur_caddy="$(command -v caddy)"
+set -e
+if [ -n "$cur_caddy" ]; then
+  cur_ver=$(caddy version | head -n 1 | cut -d ' ' -f 2)
+  if [ "$cur_ver" == "$WEBI_VERSION" ]; then
+    echo "caddy v$WEBI_VERSION already installed at $cur_caddy"
+    exit 0
+  elif [ "$cur_caddy" != "$new_caddy" ]; then
+    echo "WARN: possible conflict with caddy v$WEBI_VERSION at $cur_caddy"
+  fi
+fi
+
+# Note: this file is `source`d by the true installer and hence will have the webi functions
+
+# because we created releases.js we can use webi_download()
+# downloads caddy to ~/Downloads
+webi_download
+
+# because this is tar or zip, we can webi_extract()
+# extracts to the WEBI_TMP directory, raw (no --strip-prefix)
+webi_extract
+
+pushd "$WEBI_TMP" 2>&1 >/dev/null
+        echo Installing caddy v${WEBI_VERSION} as "$new_caddy"
+        mv ./caddy "$HOME/.local/bin/"
+popd 2>&1 >/dev/null
+
+###################
+#   Update PATH   #
+###################
+
+# TODO get better output from pathman / output the path to add as return to webi bootstrap
+webi_path_add "$HOME/.local/bin"
+
+echo "Installed 'caddy'"
+echo ""
index 964f48131f760d99396554adbe860d0ee3fe3e0c..0b3c77d82bd039f0c55c4f4fcc92eb2cd22295c1 100644 (file)
@@ -16,6 +16,6 @@ module.exports = function (request) {
 
 if (module === require.main) {
   module.exports(require('@root/request')).then(function (all) {
-    console.log(JSON.stringify(all));
+    console.info(JSON.stringify(all));
   });
 }
diff --git a/flutter/flutter.bash b/flutter/flutter.bash
deleted file mode 100644 (file)
index 77a97c2..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# title: Flutter
-# homepage: https://flutter.dev
-# tagline: UI Toolkit for mobile, web, and desktop
-# description: |
-#   Flutter is Google’s UI toolkit for building beautiful, natively compiled applications for mobile, web, and desktop from a single codebase.
-# examples: |
-#
-#   ```bash
-#   flutter create my_app
-#   ```
-
-set -e
-set -u
-
-###################
-# Install flutter #
-###################
-
-new_flutter_home="${HOME}/.local/opt/flutter-v${WEBI_VERSION}"
-new_flutter="${HOME}/.local/opt/flutter-v${WEBI_VERSION}/bin/flutter"
-
-# Test for existing version 
-set +e
-cur_flutter="$(command -v flutter)"
-set -e
-if [ -n "$cur_flutter" ]; then
-  cur_ver=$(flutter --version | head -n 1 | cut -d' ' -f2)
-  if [ "$cur_ver" == "$(echo $WEBI_VERSION)" ]; then
-    echo "flutter v$WEBI_VERSION already installed at $cur_flutter"
-    exit 0
-  elif [ "$cur_flutter" != "$new_flutter" ]; then
-    echo "WARN: possible conflict with flutter v$WEBI_VERSION at $cur_flutter"
-  fi
-fi
-
-webi_download
-
-webi_extract
-
-pushd "${WEBI_TMP}" 2>&1 >/dev/null
-        echo Installing flutter v${WEBI_VERSION} as "$new_flutter" 
-
-        # simpler for single-binary commands
-        #mv ./example*/bin/example "$HOME/.local/bin"
-
-        # best for packages and toolchains
-        rm -rf "$new_flutter_home"
-        if [ -n "$(command -v rsync 2>/dev/null | grep rsync)" ]; then
-          rsync -Krl ./flutter*/ "$new_flutter_home/" 2>/dev/null
-        else
-          cp -Hr ./flutter*/* "$new_flutter_home/" 2>/dev/null
-          cp -Hr ./flutter*/.* "$new_flutter_home/" 2>/dev/null
-        fi
-popd 2>&1 >/dev/null
-
-###################
-#   Update PATH   #
-###################
-
-# TODO get better output from pathman / output the path to add as return to webi bootstrap
-webi_path_add "$new_flutter_home/bin"
-echo "Installed 'flutter'"
-echo ""
diff --git a/flutter/install.bash b/flutter/install.bash
new file mode 100644 (file)
index 0000000..77a97c2
--- /dev/null
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# title: Flutter
+# homepage: https://flutter.dev
+# tagline: UI Toolkit for mobile, web, and desktop
+# description: |
+#   Flutter is Google’s UI toolkit for building beautiful, natively compiled applications for mobile, web, and desktop from a single codebase.
+# examples: |
+#
+#   ```bash
+#   flutter create my_app
+#   ```
+
+set -e
+set -u
+
+###################
+# Install flutter #
+###################
+
+new_flutter_home="${HOME}/.local/opt/flutter-v${WEBI_VERSION}"
+new_flutter="${HOME}/.local/opt/flutter-v${WEBI_VERSION}/bin/flutter"
+
+# Test for existing version 
+set +e
+cur_flutter="$(command -v flutter)"
+set -e
+if [ -n "$cur_flutter" ]; then
+  cur_ver=$(flutter --version | head -n 1 | cut -d' ' -f2)
+  if [ "$cur_ver" == "$(echo $WEBI_VERSION)" ]; then
+    echo "flutter v$WEBI_VERSION already installed at $cur_flutter"
+    exit 0
+  elif [ "$cur_flutter" != "$new_flutter" ]; then
+    echo "WARN: possible conflict with flutter v$WEBI_VERSION at $cur_flutter"
+  fi
+fi
+
+webi_download
+
+webi_extract
+
+pushd "${WEBI_TMP}" 2>&1 >/dev/null
+        echo Installing flutter v${WEBI_VERSION} as "$new_flutter" 
+
+        # simpler for single-binary commands
+        #mv ./example*/bin/example "$HOME/.local/bin"
+
+        # best for packages and toolchains
+        rm -rf "$new_flutter_home"
+        if [ -n "$(command -v rsync 2>/dev/null | grep rsync)" ]; then
+          rsync -Krl ./flutter*/ "$new_flutter_home/" 2>/dev/null
+        else
+          cp -Hr ./flutter*/* "$new_flutter_home/" 2>/dev/null
+          cp -Hr ./flutter*/.* "$new_flutter_home/" 2>/dev/null
+        fi
+popd 2>&1 >/dev/null
+
+###################
+#   Update PATH   #
+###################
+
+# TODO get better output from pathman / output the path to add as return to webi bootstrap
+webi_path_add "$new_flutter_home/bin"
+echo "Installed 'flutter'"
+echo ""
index 41a0be2de0e0fa7277d91040bf5884449c8f3db8..3a6493851d2e3a8af2a72c8d9ea66c54d465c7a3 100644 (file)
@@ -21,7 +21,6 @@ module.exports = function (request) {
         body.releases.forEach(function (asset) {
           if (!map[asset.channel]) {
             map[asset.channel] = true;
-            console.log('a', asset.channel);
           }
           all.releases.push({
             // nix leading 'v'
@@ -60,6 +59,6 @@ module.exports = function (request) {
 if (module === require.main) {
   module.exports(require('@root/request')).then(function (all) {
     all.releases = all.releases.slice(25);
-    console.log(JSON.stringify(all, null, 2));
+    console.info(JSON.stringify(all, null, 2));
   });
 }
diff --git a/go/go.bash b/go/go.bash
deleted file mode 100644 (file)
index f9366bf..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# title: Go (golang alias)
-# homepage: https://webinstall.dev/golang
-# tagline: Alias for https://webinstall.dev/golang
-# alias: golang
-# description: |
-#   See https://webinstall.dev/golang
-
-curl -fsSL https://webinstall.dev/golang | bash
diff --git a/go/install.bash b/go/install.bash
new file mode 100644 (file)
index 0000000..f9366bf
--- /dev/null
@@ -0,0 +1,8 @@
+# title: Go (golang alias)
+# homepage: https://webinstall.dev/golang
+# tagline: Alias for https://webinstall.dev/golang
+# alias: golang
+# description: |
+#   See https://webinstall.dev/golang
+
+curl -fsSL https://webinstall.dev/golang | bash
diff --git a/golang/golang.bash b/golang/golang.bash
deleted file mode 100644 (file)
index 59ca0f4..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-
-# title: Go
-# homepage: https://golang.org
-# tagline: The Go Programming Language tools
-# description: |
-#   Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.
-# examples: |
-#   ```bash
-#   mkdir -p hello/
-#   pushd hello/
-#   ```
-#   <br/>
-#
-#   ```bash
-#   cat << EOF >> main.go
-#   package main
-#
-#   import (
-#     "fmt"
-#   )
-#
-#   func main () {
-#     fmt.Println("Hello, World!")
-#   }
-#   EOF
-#   ```
-#   <br/>
-#
-#   ```bash
-#   go fmt ./...
-#   go build .
-#   ./hello
-#   > Hello, World!
-#   ```
-
-set -e
-set -u
-
-###################
-# Install go #
-###################
-
-new_go_home="${HOME}/.local/opt/go-v${WEBI_VERSION}"
-new_go="${HOME}/.local/opt/go-v${WEBI_VERSION}/bin/go"
-
-# Test for existing version
-set +e
-cur_go="$(command -v go)"
-set -e
-if [ -n "$cur_go" ]; then
-  cur_ver=$(go version | cut -d' ' -f3 | sed 's:go::')
-  if [ "$cur_ver" == "$(echo $WEBI_VERSION | sed 's:\.0::g')" ]; then
-    echo "go v$WEBI_VERSION already installed at $cur_go"
-    exit 0
-  elif [ "$cur_go" != "$new_go" ]; then
-    echo "WARN: possible conflict with go v$WEBI_VERSION at $cur_go"
-  fi
-fi
-
-
-# Note: this file is `source`d by the true installer and hence will have the webi functions
-
-# because we created releases.js we can use webi_download()
-# downloads go to ~/Downloads
-webi_download
-
-# because this is tar or zip, we can webi_extract()
-# extracts to the WEBI_TMP directory, raw (no --strip-prefix)
-webi_extract
-
-pushd "$WEBI_TMP" 2>&1 >/dev/null
-    echo Installing go v${WEBI_VERSION} as "$new_go"
-
-    # simpler for single-binary commands
-    #mv ./example*/bin/example "$HOME/.local/bin"
-
-    # best for packages and toolchains
-    rm -rf "$new_go_home"
-    if [ -n "$(command -v rsync 2>/dev/null | grep rsync)" ]; then
-      rsync -Krl ./go*/ "$new_go_home/" 2>/dev/null
-    else
-      cp -Hr ./go*/* "$new_go_home/" 2>/dev/null
-      cp -Hr ./go*/.* "$new_go_home/" 2>/dev/null
-    fi
-
-    # Install x go
-    $new_go_home/bin/go get golang.org/x/tools/cmd/goimports > /dev/null 2>/dev/null
-    $new_go_home/bin/go get golang.org/x/tools/cmd/gorename > /dev/null 2>/dev/null
-    $new_go_home/bin/go get golang.org/x/tools/cmd/gotype > /dev/null 2>/dev/null
-    $new_go_home/bin/go get golang.org/x/tools/cmd/stringer > /dev/null 2>/dev/null
-popd 2>&1 >/dev/null
-
-###################
-#   Update PATH   #
-###################
-
-# TODO get better output from pathman / output the path to add as return to webi bootstrap
-webi_path_add "$new_go_home/bin"
-webi_path_add "$HOME/go/bin"
-
-echo "Installed 'go' (and go tools)"
-echo ""
diff --git a/golang/install.bash b/golang/install.bash
new file mode 100644 (file)
index 0000000..59ca0f4
--- /dev/null
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# title: Go
+# homepage: https://golang.org
+# tagline: The Go Programming Language tools
+# description: |
+#   Go is an open source programming language that makes it easy to build simple, reliable, and efficient software.
+# examples: |
+#   ```bash
+#   mkdir -p hello/
+#   pushd hello/
+#   ```
+#   <br/>
+#
+#   ```bash
+#   cat << EOF >> main.go
+#   package main
+#
+#   import (
+#     "fmt"
+#   )
+#
+#   func main () {
+#     fmt.Println("Hello, World!")
+#   }
+#   EOF
+#   ```
+#   <br/>
+#
+#   ```bash
+#   go fmt ./...
+#   go build .
+#   ./hello
+#   > Hello, World!
+#   ```
+
+set -e
+set -u
+
+###################
+# Install go #
+###################
+
+new_go_home="${HOME}/.local/opt/go-v${WEBI_VERSION}"
+new_go="${HOME}/.local/opt/go-v${WEBI_VERSION}/bin/go"
+
+# Test for existing version
+set +e
+cur_go="$(command -v go)"
+set -e
+if [ -n "$cur_go" ]; then
+  cur_ver=$(go version | cut -d' ' -f3 | sed 's:go::')
+  if [ "$cur_ver" == "$(echo $WEBI_VERSION | sed 's:\.0::g')" ]; then
+    echo "go v$WEBI_VERSION already installed at $cur_go"
+    exit 0
+  elif [ "$cur_go" != "$new_go" ]; then
+    echo "WARN: possible conflict with go v$WEBI_VERSION at $cur_go"
+  fi
+fi
+
+
+# Note: this file is `source`d by the true installer and hence will have the webi functions
+
+# because we created releases.js we can use webi_download()
+# downloads go to ~/Downloads
+webi_download
+
+# because this is tar or zip, we can webi_extract()
+# extracts to the WEBI_TMP directory, raw (no --strip-prefix)
+webi_extract
+
+pushd "$WEBI_TMP" 2>&1 >/dev/null
+    echo Installing go v${WEBI_VERSION} as "$new_go"
+
+    # simpler for single-binary commands
+    #mv ./example*/bin/example "$HOME/.local/bin"
+
+    # best for packages and toolchains
+    rm -rf "$new_go_home"
+    if [ -n "$(command -v rsync 2>/dev/null | grep rsync)" ]; then
+      rsync -Krl ./go*/ "$new_go_home/" 2>/dev/null
+    else
+      cp -Hr ./go*/* "$new_go_home/" 2>/dev/null
+      cp -Hr ./go*/.* "$new_go_home/" 2>/dev/null
+    fi
+
+    # Install x go
+    $new_go_home/bin/go get golang.org/x/tools/cmd/goimports > /dev/null 2>/dev/null
+    $new_go_home/bin/go get golang.org/x/tools/cmd/gorename > /dev/null 2>/dev/null
+    $new_go_home/bin/go get golang.org/x/tools/cmd/gotype > /dev/null 2>/dev/null
+    $new_go_home/bin/go get golang.org/x/tools/cmd/stringer > /dev/null 2>/dev/null
+popd 2>&1 >/dev/null
+
+###################
+#   Update PATH   #
+###################
+
+# TODO get better output from pathman / output the path to add as return to webi bootstrap
+webi_path_add "$new_go_home/bin"
+webi_path_add "$HOME/go/bin"
+
+echo "Installed 'go' (and go tools)"
+echo ""
index d7dd22a7c7ff3950294dd1e550b61cf022db7648..133d8fd44b65e1b774bf219ce669753c0542a804 100644 (file)
@@ -73,6 +73,6 @@ if (module === require.main) {
   getAllReleases(require('@root/request')).then(function (all) {
     all = require('../_common/normalize.js')(all);
     all.releases = all.releases.slice(0, 10);
-    console.log(JSON.stringify(all, null, 2));
+    console.info(JSON.stringify(all, null, 2));
   });
 }
diff --git a/macos/install.bash b/macos/install.bash
new file mode 100644 (file)
index 0000000..dd5566b
--- /dev/null
@@ -0,0 +1,41 @@
+# title: macOS
+# homepage: https://bootableinstaller.com/macos/
+# tagline: Bootable macOS Installer
+# description: |
+#   Downloads the official OS X / macOS dmg from Apple to create bootable installers - works from macOS, Linux, or even Windows (through VirtualBox).
+# examples: |
+#
+#   Use with Balena Etcher to burn ISO to USB, or boot with VirtualBox.
+#
+#   ```txt
+#   Created ~/Downloads/el-capitan.iso
+#   ```
+
+set -e
+set -u
+
+webi_download
+
+pushd ~/Downloads 2>&1 >/dev/null
+
+if [ "Darwin" == "$(uname -s)" ]; then
+  curl -fsSL 'https://gist.githubusercontent.com/solderjs/8c36d132250163011c83bad8284975ee/raw/5a291955813743c20c12ca2d35c7b1bb34f8aecc/create-bootable-installer-for-os-x-el-capitan.sh' -o create-bootable-installer-for-os-x-el-capitan.sh
+  bash create-bootable-installer-for-os-x-el-capitan.sh
+else
+  curl -fsSL 'https://gist.githubusercontent.com/solderjs/9834a45a6c21a41e8882698a00b55787/raw/c43061cd0c53ec675996f5cb66c7077e666aabd4/install-mac-tools.sh' -o install-mac-tools.sh
+  # TODO add xar to webinstall.dev
+  sudo apt install libz-dev # needed for xar
+  bash install-mac-tools.sh
+  echo "WARN: may need a restart for hfsplus to be recognized by the kernel"
+
+  curl -fsSL 'https://gist.github.com/solderjs/04fd06560a8465a695337eb502f5b0e9/raw/0a06fb4dce91399d374d9a12958dabb48a9bd42a/empty.7400m.img.bz2' -o empty.7400m.img.bz2
+
+  curl -fsSL 'https://gist.githubusercontent.com/solderjs/9834a45a6c21a41e8882698a00b55787/raw/c43061cd0c53ec675996f5cb66c7077e666aabd4/linux-create-bootable-macos-recovery-image.sh' -o linux-create-bootable-macos-recovery-image.sh
+  bash linux-create-bootable-macos-recovery-image.sh
+fi
+
+echo ""
+echo "Created $HOME/Downloads/el-capitan.iso"
+echo ""
+
+popd 2>&1 >/dev/null
diff --git a/macos/macos.bash b/macos/macos.bash
deleted file mode 100644 (file)
index dd5566b..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# title: macOS
-# homepage: https://bootableinstaller.com/macos/
-# tagline: Bootable macOS Installer
-# description: |
-#   Downloads the official OS X / macOS dmg from Apple to create bootable installers - works from macOS, Linux, or even Windows (through VirtualBox).
-# examples: |
-#
-#   Use with Balena Etcher to burn ISO to USB, or boot with VirtualBox.
-#
-#   ```txt
-#   Created ~/Downloads/el-capitan.iso
-#   ```
-
-set -e
-set -u
-
-webi_download
-
-pushd ~/Downloads 2>&1 >/dev/null
-
-if [ "Darwin" == "$(uname -s)" ]; then
-  curl -fsSL 'https://gist.githubusercontent.com/solderjs/8c36d132250163011c83bad8284975ee/raw/5a291955813743c20c12ca2d35c7b1bb34f8aecc/create-bootable-installer-for-os-x-el-capitan.sh' -o create-bootable-installer-for-os-x-el-capitan.sh
-  bash create-bootable-installer-for-os-x-el-capitan.sh
-else
-  curl -fsSL 'https://gist.githubusercontent.com/solderjs/9834a45a6c21a41e8882698a00b55787/raw/c43061cd0c53ec675996f5cb66c7077e666aabd4/install-mac-tools.sh' -o install-mac-tools.sh
-  # TODO add xar to webinstall.dev
-  sudo apt install libz-dev # needed for xar
-  bash install-mac-tools.sh
-  echo "WARN: may need a restart for hfsplus to be recognized by the kernel"
-
-  curl -fsSL 'https://gist.github.com/solderjs/04fd06560a8465a695337eb502f5b0e9/raw/0a06fb4dce91399d374d9a12958dabb48a9bd42a/empty.7400m.img.bz2' -o empty.7400m.img.bz2
-
-  curl -fsSL 'https://gist.githubusercontent.com/solderjs/9834a45a6c21a41e8882698a00b55787/raw/c43061cd0c53ec675996f5cb66c7077e666aabd4/linux-create-bootable-macos-recovery-image.sh' -o linux-create-bootable-macos-recovery-image.sh
-  bash linux-create-bootable-macos-recovery-image.sh
-fi
-
-echo ""
-echo "Created $HOME/Downloads/el-capitan.iso"
-echo ""
-
-popd 2>&1 >/dev/null
index 30ae31b3adf65a3551abf58b4eb08b3995859a07..39f7c3fde683ce3b31a497f646035be94a5dc1fe 100644 (file)
@@ -85,6 +85,6 @@ module.exports = function (request) {
 
 if (module === require.main) {
   module.exports(require('@root/request')).then(function (all) {
-    console.log(JSON.stringify(all, null, 2));
+    console.info(JSON.stringify(all, null, 2));
   });
 }
diff --git a/node/install.bash b/node/install.bash
new file mode 100644 (file)
index 0000000..e4a2ef7
--- /dev/null
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# title: Node.js
+# homepage: https://nodejs.org
+# tagline: JavaScript V8 runtime
+# description: |
+#   Node.js® is a JavaScript runtime built on Chrome's V8 JavaScript engine
+# examples: |
+#   ```bash
+#   node -e 'console.log("Hello, World!")'
+#   > Hello, World!
+#   ```
+#   <br/>
+#   <br/>
+#
+#   <table>
+#   <tr>
+#   <td>Run a webserver</td>
+#   <td><pre><code class="language-bash">
+#   mkdir my-server
+#   pushd my-server
+#   npm init
+#   npm install --save express</code></pre>
+#   <br/>
+#   <code>app.js:</code>
+#   <br/>
+#   <pre><code class="language-javascript">'use strict'
+#   var express = require('express');
+#   var app = express();
+#
+#   app.use('/', function (req, res, next) {
+#     res.end("Hello, World!");
+#   });
+#
+#   module.exports = app;</code></pre>
+#   <br/>
+#   <code>server.js:</code>
+#   <br/>
+#   <pre><code class="language-javascript">'use strict'
+#   var http = require('http');
+#   var app = require('./app.js');
+#   http.createServer(app).listen(8080, function () {
+#     console.log('Listening on', this.address());
+#   });</code></pre>
+#   <br/>
+#   <pre><code class="language-bash">npm start</code></pre>
+#   </td>
+#   </tr>
+#   </table>
+
+set -e
+set -u
+
+##################
+#  Install node  #
+##################
+
+new_node_home="${HOME}/.local/opt/node-v${WEBI_VERSION}"
+new_node="${HOME}/.local/opt/node-v${WEBI_VERSION}/bin/node"
+
+# Test for existing version
+set +e
+cur_node="$(command -v node)"
+set -e
+if [ -e "$new_node_home/bin/node" ]; then
+    # node of some version is already installed
+    if [ "v${WEBI_VERSION}" == "$("$new_node_home/bin/node" -v 2>/dev/null)" ]; then
+        echo node v${WEBI_VERSION} already installed at $new_node_home
+        exit 0
+    fi
+fi
+if [ -n "$cur_node" ] && [ "$cur_node" != "$new_node" ]; then
+    echo "WARN: possible conflict with node v$WEBI_VERSION at $cur_node"
+fi
+
+# Note: this file is `source`d by the true installer and hence will have the webi functions
+
+# because we created releases.js we can use webi_download()
+# downloads node to ~/Downloads
+webi_download
+
+# because this is tar or zip, we can webi_extract()
+# extracts to the WEBI_TMP directory, raw (no --strip-prefix)
+webi_extract
+
+pushd "$WEBI_TMP" 2>&1 >/dev/null
+    echo Installing node v${WEBI_VERSION} as "$new_node"
+
+    # simpler for single-binary commands
+    #mv ./example*/bin/example "$HOME/.local/bin"
+
+    # best for packages and toolchains
+    rm -rf "$new_node_home"
+    if [ -n "$(command -v rsync 2>/dev/null | grep rsync)" ]; then
+      rsync -Krl ./node*/ "$new_node_home/" 2>/dev/null
+    else
+      cp -Hr ./node*/* "$new_node_home/" 2>/dev/null
+      cp -Hr ./node*/.* "$new_node_home/" 2>/dev/null
+    fi
+popd 2>&1 >/dev/null
+
+###################
+#   Update PATH   #
+###################
+
+# TODO get better output from pathman / output the path to add as return to webi bootstrap
+webi_path_add "$new_node_home/bin"
+
+echo "Installed 'node' and 'npm'"
+echo ""
diff --git a/node/node.bash b/node/node.bash
deleted file mode 100644 (file)
index e4a2ef7..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-
-# title: Node.js
-# homepage: https://nodejs.org
-# tagline: JavaScript V8 runtime
-# description: |
-#   Node.js® is a JavaScript runtime built on Chrome's V8 JavaScript engine
-# examples: |
-#   ```bash
-#   node -e 'console.log("Hello, World!")'
-#   > Hello, World!
-#   ```
-#   <br/>
-#   <br/>
-#
-#   <table>
-#   <tr>
-#   <td>Run a webserver</td>
-#   <td><pre><code class="language-bash">
-#   mkdir my-server
-#   pushd my-server
-#   npm init
-#   npm install --save express</code></pre>
-#   <br/>
-#   <code>app.js:</code>
-#   <br/>
-#   <pre><code class="language-javascript">'use strict'
-#   var express = require('express');
-#   var app = express();
-#
-#   app.use('/', function (req, res, next) {
-#     res.end("Hello, World!");
-#   });
-#
-#   module.exports = app;</code></pre>
-#   <br/>
-#   <code>server.js:</code>
-#   <br/>
-#   <pre><code class="language-javascript">'use strict'
-#   var http = require('http');
-#   var app = require('./app.js');
-#   http.createServer(app).listen(8080, function () {
-#     console.log('Listening on', this.address());
-#   });</code></pre>
-#   <br/>
-#   <pre><code class="language-bash">npm start</code></pre>
-#   </td>
-#   </tr>
-#   </table>
-
-set -e
-set -u
-
-##################
-#  Install node  #
-##################
-
-new_node_home="${HOME}/.local/opt/node-v${WEBI_VERSION}"
-new_node="${HOME}/.local/opt/node-v${WEBI_VERSION}/bin/node"
-
-# Test for existing version
-set +e
-cur_node="$(command -v node)"
-set -e
-if [ -e "$new_node_home/bin/node" ]; then
-    # node of some version is already installed
-    if [ "v${WEBI_VERSION}" == "$("$new_node_home/bin/node" -v 2>/dev/null)" ]; then
-        echo node v${WEBI_VERSION} already installed at $new_node_home
-        exit 0
-    fi
-fi
-if [ -n "$cur_node" ] && [ "$cur_node" != "$new_node" ]; then
-    echo "WARN: possible conflict with node v$WEBI_VERSION at $cur_node"
-fi
-
-# Note: this file is `source`d by the true installer and hence will have the webi functions
-
-# because we created releases.js we can use webi_download()
-# downloads node to ~/Downloads
-webi_download
-
-# because this is tar or zip, we can webi_extract()
-# extracts to the WEBI_TMP directory, raw (no --strip-prefix)
-webi_extract
-
-pushd "$WEBI_TMP" 2>&1 >/dev/null
-    echo Installing node v${WEBI_VERSION} as "$new_node"
-
-    # simpler for single-binary commands
-    #mv ./example*/bin/example "$HOME/.local/bin"
-
-    # best for packages and toolchains
-    rm -rf "$new_node_home"
-    if [ -n "$(command -v rsync 2>/dev/null | grep rsync)" ]; then
-      rsync -Krl ./node*/ "$new_node_home/" 2>/dev/null
-    else
-      cp -Hr ./node*/* "$new_node_home/" 2>/dev/null
-      cp -Hr ./node*/.* "$new_node_home/" 2>/dev/null
-    fi
-popd 2>&1 >/dev/null
-
-###################
-#   Update PATH   #
-###################
-
-# TODO get better output from pathman / output the path to add as return to webi bootstrap
-webi_path_add "$new_node_home/bin"
-
-echo "Installed 'node' and 'npm'"
-echo ""
index 40afcf92ae8cabf92f47d940f45f19accf941509..c2fc470925fcc114c13cbd0f07b1493483d3788a 100644 (file)
@@ -140,7 +140,7 @@ module.exports = getAllReleases;
 
 if (module === require.main) {
   getAllReleases(require('@root/request')).then(function (all) {
-    console.log(JSON.stringify(all));
-    //console.log(JSON.stringify(all, null, 2));
+    console.info(JSON.stringify(all));
+    //console.info(JSON.stringify(all, null, 2));
   });
 }
diff --git a/pathman/install.bash b/pathman/install.bash
new file mode 100644 (file)
index 0000000..4b9e538
--- /dev/null
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# title: Pathman
+# homepage: https://git.rootprojects.org/root/pathman
+# tagline: cross-platform PATH management for bash, zsh, fish, cmd.exe, and PowerShell
+# description: |
+#   Manages PATH on various OSes and shells
+#     - Mac, Windows, Linux
+#     - Bash, Zsh, Fish
+#     - Command, Powershell
+# examples: |
+#   ```bash
+#   pathman add ~/.local/bin
+#   ```
+#   <br/>
+#
+#   ```bash
+#   pathman remove ~/.local/bin
+#   ```
+#   <br/>
+#
+#   ```bash
+#   pathman list
+#   ```
+
+
+set -e
+set -u
+
+# Test if in PATH
+set +e
+my_pathman=$(command -v pathman)
+set -e
+if [ -n "$my_pathman" ]; then
+    # TODO test pathman version
+    # if [ "$WEBI_VERSION" == "$(pathman version | cut -d ' ' -f2)" ]; then
+       if [ "$my_pathman" != "$HOME/.local/bin/pathman" ]; then
+               echo "a pathman installation (which make take precedence) exists at:"
+               echo "    $my_pathman"
+               echo ""
+       fi
+    echo "pathman already installed"
+    exit 0
+fi
+
+# TODO use webi_download via releases.js
+webi_download "https://rootprojects.org/pathman/dist/$(uname -s)/$(uname -m)/pathman" "$HOME/.local/bin/pathman"
+
+# TODO use webi_extract
+chmod +x "$HOME/.local/bin/pathman"
+
+# add to ~/.local/bin to PATH even if pathman is elsewhere
+# TODO pathman needs silent option and debug output (quiet "already exists" output)
+"$HOME/.local/bin/pathman" add ~/.local/bin # > /dev/null 2> /dev/null
+# TODO inform user to add to path, apart from pathman?
diff --git a/pathman/pathman.bash b/pathman/pathman.bash
deleted file mode 100644 (file)
index 4b9e538..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# title: Pathman
-# homepage: https://git.rootprojects.org/root/pathman
-# tagline: cross-platform PATH management for bash, zsh, fish, cmd.exe, and PowerShell
-# description: |
-#   Manages PATH on various OSes and shells
-#     - Mac, Windows, Linux
-#     - Bash, Zsh, Fish
-#     - Command, Powershell
-# examples: |
-#   ```bash
-#   pathman add ~/.local/bin
-#   ```
-#   <br/>
-#
-#   ```bash
-#   pathman remove ~/.local/bin
-#   ```
-#   <br/>
-#
-#   ```bash
-#   pathman list
-#   ```
-
-
-set -e
-set -u
-
-# Test if in PATH
-set +e
-my_pathman=$(command -v pathman)
-set -e
-if [ -n "$my_pathman" ]; then
-    # TODO test pathman version
-    # if [ "$WEBI_VERSION" == "$(pathman version | cut -d ' ' -f2)" ]; then
-       if [ "$my_pathman" != "$HOME/.local/bin/pathman" ]; then
-               echo "a pathman installation (which make take precedence) exists at:"
-               echo "    $my_pathman"
-               echo ""
-       fi
-    echo "pathman already installed"
-    exit 0
-fi
-
-# TODO use webi_download via releases.js
-webi_download "https://rootprojects.org/pathman/dist/$(uname -s)/$(uname -m)/pathman" "$HOME/.local/bin/pathman"
-
-# TODO use webi_extract
-chmod +x "$HOME/.local/bin/pathman"
-
-# add to ~/.local/bin to PATH even if pathman is elsewhere
-# TODO pathman needs silent option and debug output (quiet "already exists" output)
-"$HOME/.local/bin/pathman" add ~/.local/bin # > /dev/null 2> /dev/null
-# TODO inform user to add to path, apart from pathman?
index be23f1390115058dc0fd6bb7664fb95255694f45..141dcb4224b7546ce25d73aa0c2dd30a8d129878 100644 (file)
@@ -19,6 +19,6 @@ module.exports = function (request) {
 
 if (module === require.main) {
   module.exports(require('@root/request')).then(function (all) {
-    console.log(JSON.stringify(all, null, 2));
+    console.info(JSON.stringify(all, null, 2));
   });
 }
diff --git a/rg/install.bash b/rg/install.bash
new file mode 100644 (file)
index 0000000..afc1c19
--- /dev/null
@@ -0,0 +1,67 @@
+# title: Ripgrep
+# homepage: https://github.com/BurntSushi/ripgrep
+# tagline: a modern drop-in grep replacement
+# alias: rg
+# description: |
+#   `rg` is a drop-in replacement for `grep`, that respects `.gitignore` and `.ignore`, has all of the sensible default options you want (colors, numbers, etc) turned on by default, is written in Rust, and simply outperforms grep in every imaginable way. R.I.P. grep.
+# examples: |
+#
+#   ```bash
+#   rg <search-term> # searches recursively, ignoing .git, node_modules, etc
+#   ```
+#
+#   ```bash
+#   rg 'function doStuff'
+#   ```
+#
+#   ```bash
+#   rg 'doStuff\(.*\)'
+#   ```
+
+set -e
+set -u
+
+###################
+# Install ripgrep #
+###################
+
+new_rg="${HOME}/.local/bin/rg"
+
+# Test for existing version
+set +e
+cur_rg="$(command -v rg)"
+set -e
+if [ -n "$cur_rg" ]; then
+  cur_ver=$(rg --version | head -n 1 | cut -d ' ' -f 2)
+  if [ "$cur_ver" == "$WEBI_VERSION" ]; then
+    echo "ripgrep v$WEBI_VERSION already installed at $cur_rg"
+    exit 0
+  elif [ "$cur_rg" != "$new_rg" ]; then
+    echo "WARN: possible conflict with ripgrep v$WEBI_VERSION at $cur_rg"
+  fi
+fi
+
+# Note: this file is `source`d by the true installer and hence will have the webi functions
+
+# because we created releases.js we can use webi_download()
+# downloads ripgrep to ~/Downloads
+webi_download
+
+# because this is tar or zip, we can webi_extract()
+# extracts to the WEBI_TMP directory, raw (no --strip-prefix)
+webi_extract
+
+pushd "$WEBI_TMP" 2>&1 >/dev/null
+        echo Installing ripgrep v${WEBI_VERSION} as "$new_rg"
+        mv ./ripgrep-*/rg "$HOME/.local/bin/"
+popd 2>&1 >/dev/null
+
+###################
+#   Update PATH   #
+###################
+
+# TODO get better output from pathman / output the path to add as return to webi bootstrap
+webi_path_add "$HOME/.local/bin"
+
+echo "Installed 'rg'"
+echo ""
index 17c194f92f7d3ecbd80c2f9474e3853d332ffc75..6fd4f622ff6ea3f30fe4e223ddca79c7955108af 100644 (file)
@@ -12,7 +12,7 @@ module.exports = function (request) {
 
 if (module === require.main) {
   module.exports(require('@root/request')).then(function (all) {
-    console.log(JSON.stringify(all));
-    //console.log(JSON.stringify(all, null, 2));
+    console.info(JSON.stringify(all));
+    //console.info(JSON.stringify(all, null, 2));
   });
 }
diff --git a/rg/rg.bash b/rg/rg.bash
deleted file mode 100644 (file)
index afc1c19..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-# title: Ripgrep
-# homepage: https://github.com/BurntSushi/ripgrep
-# tagline: a modern drop-in grep replacement
-# alias: rg
-# description: |
-#   `rg` is a drop-in replacement for `grep`, that respects `.gitignore` and `.ignore`, has all of the sensible default options you want (colors, numbers, etc) turned on by default, is written in Rust, and simply outperforms grep in every imaginable way. R.I.P. grep.
-# examples: |
-#
-#   ```bash
-#   rg <search-term> # searches recursively, ignoing .git, node_modules, etc
-#   ```
-#
-#   ```bash
-#   rg 'function doStuff'
-#   ```
-#
-#   ```bash
-#   rg 'doStuff\(.*\)'
-#   ```
-
-set -e
-set -u
-
-###################
-# Install ripgrep #
-###################
-
-new_rg="${HOME}/.local/bin/rg"
-
-# Test for existing version
-set +e
-cur_rg="$(command -v rg)"
-set -e
-if [ -n "$cur_rg" ]; then
-  cur_ver=$(rg --version | head -n 1 | cut -d ' ' -f 2)
-  if [ "$cur_ver" == "$WEBI_VERSION" ]; then
-    echo "ripgrep v$WEBI_VERSION already installed at $cur_rg"
-    exit 0
-  elif [ "$cur_rg" != "$new_rg" ]; then
-    echo "WARN: possible conflict with ripgrep v$WEBI_VERSION at $cur_rg"
-  fi
-fi
-
-# Note: this file is `source`d by the true installer and hence will have the webi functions
-
-# because we created releases.js we can use webi_download()
-# downloads ripgrep to ~/Downloads
-webi_download
-
-# because this is tar or zip, we can webi_extract()
-# extracts to the WEBI_TMP directory, raw (no --strip-prefix)
-webi_extract
-
-pushd "$WEBI_TMP" 2>&1 >/dev/null
-        echo Installing ripgrep v${WEBI_VERSION} as "$new_rg"
-        mv ./ripgrep-*/rg "$HOME/.local/bin/"
-popd 2>&1 >/dev/null
-
-###################
-#   Update PATH   #
-###################
-
-# TODO get better output from pathman / output the path to add as return to webi bootstrap
-webi_path_add "$HOME/.local/bin"
-
-echo "Installed 'rg'"
-echo ""
diff --git a/ripgrep/install.bash b/ripgrep/install.bash
new file mode 100644 (file)
index 0000000..faf0f17
--- /dev/null
@@ -0,0 +1,9 @@
+# title: Ripgrep (alias)
+# homepage: https://webinstall.dev/rg
+# tagline: `ripgrep` (project) is an alias for `rg` (command)
+# alias: rg
+# description: |
+#   See https://webinstall.dev/rg
+
+echo "'ripgrep' (project) is an alias for 'rg' (command)"
+curl -fsSL https://webinstall.dev/rg@${WEBI_VERSION:-} | bash
index 17c194f92f7d3ecbd80c2f9474e3853d332ffc75..6fd4f622ff6ea3f30fe4e223ddca79c7955108af 100644 (file)
@@ -12,7 +12,7 @@ module.exports = function (request) {
 
 if (module === require.main) {
   module.exports(require('@root/request')).then(function (all) {
-    console.log(JSON.stringify(all));
-    //console.log(JSON.stringify(all, null, 2));
+    console.info(JSON.stringify(all));
+    //console.info(JSON.stringify(all, null, 2));
   });
 }
diff --git a/ripgrep/ripgrep.bash b/ripgrep/ripgrep.bash
deleted file mode 100644 (file)
index faf0f17..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# title: Ripgrep (alias)
-# homepage: https://webinstall.dev/rg
-# tagline: `ripgrep` (project) is an alias for `rg` (command)
-# alias: rg
-# description: |
-#   See https://webinstall.dev/rg
-
-echo "'ripgrep' (project) is an alias for 'rg' (command)"
-curl -fsSL https://webinstall.dev/rg@${WEBI_VERSION:-} | bash
diff --git a/rust/install.bash b/rust/install.bash
new file mode 100644 (file)
index 0000000..ad83dbc
--- /dev/null
@@ -0,0 +1,8 @@
+# title: Rust (rustlang alias)
+# homepage: https://webinstall.dev/rustlang
+# tagline: Alias for https://webinstall.dev/rustlang
+# alias: rustlang
+# description: |
+#   See https://webinstall.dev/rustlang
+
+curl -fsSL https://webinstall.dev/rustlang | bash
diff --git a/rust/rust.bash b/rust/rust.bash
deleted file mode 100644 (file)
index ad83dbc..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# title: Rust (rustlang alias)
-# homepage: https://webinstall.dev/rustlang
-# tagline: Alias for https://webinstall.dev/rustlang
-# alias: rustlang
-# description: |
-#   See https://webinstall.dev/rustlang
-
-curl -fsSL https://webinstall.dev/rustlang | bash
diff --git a/rustlang/install.bash b/rustlang/install.bash
new file mode 100644 (file)
index 0000000..e95f172
--- /dev/null
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# title: Rust
+# homepage: https://rust-lang.org
+# tagline: The Rust Toolchain
+# description: |
+#   A language empowering everyone to build reliable and efficient software.
+#
+#   Rust is the modern language used to build all of your favorite CLI tools, such as
+#     - rg (ripgrep, modern grep)
+#     - fd (modern find)
+#     - sd (modern sed)
+#     - lsd (modern ls)
+#     - bat (modern cat)
+# examples: |
+#   ```bash
+#   cargo install ripgrep
+#   ```
+#   <br/>
+#
+#   ```bash
+#   cargo new hello --bin
+#   cargo build --release
+#   ./hello
+#   > "Hello, world!"
+#   ```
+
+
+# Straight from https://rustup.rs/
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
diff --git a/rustlang/rustlang.bash b/rustlang/rustlang.bash
deleted file mode 100644 (file)
index e95f172..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# title: Rust
-# homepage: https://rust-lang.org
-# tagline: The Rust Toolchain
-# description: |
-#   A language empowering everyone to build reliable and efficient software.
-#
-#   Rust is the modern language used to build all of your favorite CLI tools, such as
-#     - rg (ripgrep, modern grep)
-#     - fd (modern find)
-#     - sd (modern sed)
-#     - lsd (modern ls)
-#     - bat (modern cat)
-# examples: |
-#   ```bash
-#   cargo install ripgrep
-#   ```
-#   <br/>
-#
-#   ```bash
-#   cargo new hello --bin
-#   cargo build --release
-#   ./hello
-#   > "Hello, world!"
-#   ```
-
-
-# Straight from https://rustup.rs/
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
diff --git a/serviceman/install.bash b/serviceman/install.bash
new file mode 100644 (file)
index 0000000..df80877
--- /dev/null
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# title: Serviceman
+# homepage: https://git.rootprojects.org/root/serviceman
+# tagline: cross-platform service management for Linux, Mac, and Windows
+# description: |
+#   A system laucher that wraps `launchctl` (macOS), `systemctl` (Linux),
+#   and the Windows Registry to work cross-platform.
+# examples: |
+#
+#   Works with anything, including
+#
+#   ### Node.js
+#
+#   ```bash
+#   serviceman add --name my-service node ./serve.js --port 3000
+#   ```
+#
+#   ### Golang
+#
+#   ```bash
+#   go build -mod vendor cmd/my-service
+#   serviceman add ./my-service --port 3000
+#   ```
+#
+#   ### And even bash!
+#
+#   ```bash
+#   serviceman add --name backuper bash ./backup.sh /mnt/data
+#   ```
+
+set -e
+set -u
+
+# Test if in PATH
+set +e
+my_serviceman=$(command -v serviceman)
+set -e
+if [ -n "$my_serviceman" ]; then
+       if [ "$my_serviceman" != "$HOME/.local/bin/serviceman" ]; then
+               echo "a serviceman installation (which make take precedence) exists at:"
+               echo "    $my_serviceman"
+               echo ""
+       fi
+fi
+
+# Get arch envs, etc
+webi_download "https://rootprojects.org/serviceman/dist/$(uname -s)/$(uname -m)/serviceman" "$HOME/Downloads/serviceman"
+chmod +x "$HOME/Downloads/serviceman"
+mv "$HOME/Downloads/serviceman" "$HOME/.local/bin/"
+
+# add to ~/.local/bin to PATH, just in case
+webi_path_add $HOME/.local/bin # > /dev/null 2> /dev/null
+# TODO inform user to add to path, apart from pathman?
diff --git a/serviceman/serviceman.bash b/serviceman/serviceman.bash
deleted file mode 100644 (file)
index df80877..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# title: Serviceman
-# homepage: https://git.rootprojects.org/root/serviceman
-# tagline: cross-platform service management for Linux, Mac, and Windows
-# description: |
-#   A system laucher that wraps `launchctl` (macOS), `systemctl` (Linux),
-#   and the Windows Registry to work cross-platform.
-# examples: |
-#
-#   Works with anything, including
-#
-#   ### Node.js
-#
-#   ```bash
-#   serviceman add --name my-service node ./serve.js --port 3000
-#   ```
-#
-#   ### Golang
-#
-#   ```bash
-#   go build -mod vendor cmd/my-service
-#   serviceman add ./my-service --port 3000
-#   ```
-#
-#   ### And even bash!
-#
-#   ```bash
-#   serviceman add --name backuper bash ./backup.sh /mnt/data
-#   ```
-
-set -e
-set -u
-
-# Test if in PATH
-set +e
-my_serviceman=$(command -v serviceman)
-set -e
-if [ -n "$my_serviceman" ]; then
-       if [ "$my_serviceman" != "$HOME/.local/bin/serviceman" ]; then
-               echo "a serviceman installation (which make take precedence) exists at:"
-               echo "    $my_serviceman"
-               echo ""
-       fi
-fi
-
-# Get arch envs, etc
-webi_download "https://rootprojects.org/serviceman/dist/$(uname -s)/$(uname -m)/serviceman" "$HOME/Downloads/serviceman"
-chmod +x "$HOME/Downloads/serviceman"
-mv "$HOME/Downloads/serviceman" "$HOME/.local/bin/"
-
-# add to ~/.local/bin to PATH, just in case
-webi_path_add $HOME/.local/bin # > /dev/null 2> /dev/null
-# TODO inform user to add to path, apart from pathman?
diff --git a/vim-sensible/install.bash b/vim-sensible/install.bash
new file mode 100644 (file)
index 0000000..e19a75b
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# title: vim-sensible
+# homepage: https://github.com/tpope/vim-sensible
+# tagline: sensible defaults for vim
+# description: |
+#   Think of sensible.vim as one step above 'nocompatible' mode: a universal set of defaults that (hopefully) everyone can agree on.
+# examples: |
+#   N/A
+
+mkdir -p $HOME/.vim/pack/plugins/start
+rm -rf $HOME/.vim/pack/plugins/start/sensible
+git clone --depth=1 https://tpope.io/vim/sensible.git $HOME/.vim/pack/plugins/start/sensible
diff --git a/vim-sensible/vim-sensible.bash b/vim-sensible/vim-sensible.bash
deleted file mode 100644 (file)
index e19a75b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# title: vim-sensible
-# homepage: https://github.com/tpope/vim-sensible
-# tagline: sensible defaults for vim
-# description: |
-#   Think of sensible.vim as one step above 'nocompatible' mode: a universal set of defaults that (hopefully) everyone can agree on.
-# examples: |
-#   N/A
-
-mkdir -p $HOME/.vim/pack/plugins/start
-rm -rf $HOME/.vim/pack/plugins/start/sensible
-git clone --depth=1 https://tpope.io/vim/sensible.git $HOME/.vim/pack/plugins/start/sensible
diff --git a/webi/install.bash b/webi/install.bash
new file mode 100644 (file)
index 0000000..d32a610
--- /dev/null
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# title: Webi
+# homepage: https://webinstall.dev
+# tagline: webinstall.dev for the CLI
+# description: |
+#   for the people like us that are too lazy even to run <kbd>curl&nbsp;https://webinstall.dev/PACKAGE_NAME&nbsp;|&nbsp;bash</kbd>
+# examples: |
+#   ```bash
+#   webi node@latest
+#   ```
+#   <br/>
+#
+#   ```bash
+#   webi golang@v1.14
+#   ```
+#   <br/>
+#
+#   ```bash
+#   webi rustlang
+#   ```
+
+if [ -f "$HOME/.local/bin/webi" ]; then
+  echo "Installed 'webi'"
+else
+  echo "Install any other package via https://webinstall.dev and webi will be installed as part of the bootstrap process"
+fi
diff --git a/webi/webi.bash b/webi/webi.bash
deleted file mode 100644 (file)
index d32a610..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# title: Webi
-# homepage: https://webinstall.dev
-# tagline: webinstall.dev for the CLI
-# description: |
-#   for the people like us that are too lazy even to run <kbd>curl&nbsp;https://webinstall.dev/PACKAGE_NAME&nbsp;|&nbsp;bash</kbd>
-# examples: |
-#   ```bash
-#   webi node@latest
-#   ```
-#   <br/>
-#
-#   ```bash
-#   webi golang@v1.14
-#   ```
-#   <br/>
-#
-#   ```bash
-#   webi rustlang
-#   ```
-
-if [ -f "$HOME/.local/bin/webi" ]; then
-  echo "Installed 'webi'"
-else
-  echo "Install any other package via https://webinstall.dev and webi will be installed as part of the bootstrap process"
-fi