projects
/
webi-installers
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ea77982
)
use WEBI_HOST rather than webinstall.dev
author
AJ ONeal
<aj@therootcompany.com>
Tue, 30 Jun 2020 18:13:22 +0000
(18:13 +0000)
committer
AJ ONeal
<aj@therootcompany.com>
Tue, 30 Jun 2020 18:13:22 +0000
(18:13 +0000)
_webi/bootstrap.ps1
patch
|
blob
|
history
go/install.sh
patch
|
blob
|
history
postgresql/install.sh
patch
|
blob
|
history
ripgrep/install.sh
patch
|
blob
|
history
rust/install.sh
patch
|
blob
|
history
ssh-utils/ssh-adduser.sh
patch
|
blob
|
history
diff --git
a/_webi/bootstrap.ps1
b/_webi/bootstrap.ps1
index 5eac194b63b7dfa5601a0bd48990d9a5ac9832bf..8ec299c8e685fe0761891df40e2b38e2e1d632cb 100644
(file)
--- a/
_webi/bootstrap.ps1
+++ b/
_webi/bootstrap.ps1
@@
-23,7
+23,7
@@
pushd .local\bin
# TODO SetStrictMode
# TODO Test-Path variable:global:Env:WEBI_HOST ???
# TODO SetStrictMode
# TODO Test-Path variable:global:Env:WEBI_HOST ???
-IF(!
$Env:WEBI_HOST)
+IF(!
($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "")) {
{
$Env:WEBI_HOST = "https://webinstall.dev"
}
{
$Env:WEBI_HOST = "https://webinstall.dev"
}
diff --git
a/go/install.sh
b/go/install.sh
index f03c2cd3957089fc372f9472d6fa4dab53ba853f..613fde2edcfef5c8a5a260facf1838c39e6dd961 100644
(file)
--- a/
go/install.sh
+++ b/
go/install.sh
@@
-6,4
+6,5
@@
# See https://webinstall.dev/golang
echo "'go@${WEBI_TAG:-stable}' is an alias for 'golang@${WEBI_VERSION:-}'"
# See https://webinstall.dev/golang
echo "'go@${WEBI_TAG:-stable}' is an alias for 'golang@${WEBI_VERSION:-}'"
-curl -fsSL https://webinstall.dev/golang@${WEBI_VERSION:-} | bash
+WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
+curl -fsSL "$WEBI_HOST/golang@${WEBI_VERSION:-}" | bash
diff --git
a/postgresql/install.sh
b/postgresql/install.sh
index 68b2e2b661279816aaea1fa980164f6890e3ea88..325424455fea6f108254cf3fb59ae6f15b854293 100644
(file)
--- a/
postgresql/install.sh
+++ b/
postgresql/install.sh
@@
-6,4
+6,5
@@
# See https://webinstall.dev/postgres
echo "'postgresql' is an alias for 'postgres'"
# See https://webinstall.dev/postgres
echo "'postgresql' is an alias for 'postgres'"
-curl -fsSL https://webinstall.dev/postgres@${WEBI_VERSION:-} | bash
+WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
+curl -fsSL "$WEBI_HOST/postgres@${WEBI_VERSION:-}" | bash
diff --git
a/ripgrep/install.sh
b/ripgrep/install.sh
index 1805ebb2617382fc35881e0e0f09b6c921010067..59b5ea753619ebbde669725b744f371063f63dc0 100644
(file)
--- a/
ripgrep/install.sh
+++ b/
ripgrep/install.sh
@@
-6,4
+6,5
@@
# See https://webinstall.dev/rg
echo "'ripgrep@${WEBI_TAG:-}' (project) is an alias for 'rg@${WEBI_VERSION:-}' (command)"
# See https://webinstall.dev/rg
echo "'ripgrep@${WEBI_TAG:-}' (project) is an alias for 'rg@${WEBI_VERSION:-}' (command)"
-curl -fsSL https://webinstall.dev/rg@${WEBI_VERSION:-} | bash
+WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
+curl -fsSL "$WEBI_HOST/rg@${WEBI_VERSION:-}" | bash
diff --git
a/rust/install.sh
b/rust/install.sh
index ae4a4ac208da3ddb6bb558592e0b62e858e1ef1a..6f2f87ec6a0f453738926bb4b098cf47fcfd58bb 100644
(file)
--- a/
rust/install.sh
+++ b/
rust/install.sh
@@
-6,4
+6,5
@@
# See https://webinstall.dev/rustlang
echo "'rust' is an alias for 'rustlang'"
# See https://webinstall.dev/rustlang
echo "'rust' is an alias for 'rustlang'"
-curl -fsSL https://webinstall.dev/rustlang@${WEBI_VERSION:-} | bash
+WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
+curl -fsSL "$WEBI_HOST/rustlang@${WEBI_VERSION:-}" | bash
diff --git
a/ssh-utils/ssh-adduser.sh
b/ssh-utils/ssh-adduser.sh
index 47aefae2eeb348aa449d343488d39665d3f39e19..27c6dc89147fb66c3e3317e5bbb3fbf85985274f 100644
(file)
--- a/
ssh-utils/ssh-adduser.sh
+++ b/
ssh-utils/ssh-adduser.sh
@@
-39,8
+39,9
@@
sudo -i -u app bash -c 'ssh-keygen -b 2048 -t rsa -f /home/app/.ssh/id_rsa -q -N ""'
# Install webi for the new 'app' user
sudo -i -u app bash -c 'ssh-keygen -b 2048 -t rsa -f /home/app/.ssh/id_rsa -q -N ""'
# Install webi for the new 'app' user
- sudo -i -u app bash -c 'curl -fsSL https://webinstall.dev/webi | bash' \
- || sudo -i -u app bash -c 'wget -q -O - https://webinstall.dev/webi | bash'
+ WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
+ sudo -i -u app bash -c "curl -fsSL '$WEBI_HOST/webi' | bash" \
+ || sudo -i -u app bash -c "wget -q -O - '$WEBI_HOST/webi' | bash"
# TODO ensure that ssh-password login is off
# TODO ensure that ssh-password login is off