projects
/
webi-installers
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ee740c9
)
minor cleanup
author
AJ ONeal
<aj@therootcompany.com>
Wed, 3 Mar 2021 08:00:53 +0000
(08:00 +0000)
committer
AJ ONeal
<aj@therootcompany.com>
Wed, 3 Mar 2021 08:00:53 +0000
(08:00 +0000)
_webi/normalize.js
patch
|
blob
|
history
caddy/README.md
patch
|
blob
|
history
keypairs/install.sh
patch
|
blob
|
history
keypairs/releases.js
patch
|
blob
|
history
lf/install.sh
patch
|
blob
|
history
lf/releases.js
patch
|
blob
|
history
diff --git
a/_webi/normalize.js
b/_webi/normalize.js
index 07b08c76e910512e2b1a156c2f41a2da21084efb..5232c2775b006fc8053b09c12048316c5dc0bb06 100644
(file)
--- a/
_webi/normalize.js
+++ b/
_webi/normalize.js
@@
-135,6
+135,15
@@
function normalize(all) {
}
module.exports = normalize;
}
module.exports = normalize;
+module.exports._debug = function (all) {
+ all = normalize(all);
+ all.releases = all.releases
+ .filter(function (r) {
+ return ['windows', 'macos', 'linux'].includes(r.os) && 'amd64' === r.arch;
+ })
+ .slice(0, 10);
+ return all;
+};
// NOT in order of priority (which would be tar, xz, zip, ...)
module.exports.formats = formats;
module.exports.arches = arches;
// NOT in order of priority (which would be tar, xz, zip, ...)
module.exports.formats = formats;
module.exports.arches = arches;
diff --git
a/caddy/README.md
b/caddy/README.md
index dbffbbff633428f7506a3bf1defad6ce05e15320..424942aa2fa2612f927833c7892d48a197331aaf 100644
(file)
--- a/
caddy/README.md
+++ b/
caddy/README.md
@@
-100,7
+100,7
@@
Using a user named `app` to run your services is common industry convention.
You can use `setcap` to allow Caddy to use privileged ports.
```bash
You can use `setcap` to allow Caddy to use privileged ports.
```bash
-sudo setcap cap_net_bind_service=+ep $(readlink $(command -v caddy))
+sudo setcap cap_net_bind_service=+ep $(readlink
-f
$(command -v caddy))
```
**systemd config**
```
**systemd config**
diff --git
a/keypairs/install.sh
b/keypairs/install.sh
index 48c96aa6c6662dcc0f934c345bbe0ebcde8bf112..61bb1ad38899ddfaea9ab34ca2365123a369e2f0 100644
(file)
--- a/
keypairs/install.sh
+++ b/
keypairs/install.sh
@@
-20,7
+20,7
@@
function __init_keypairs() {
pkg_install() {
# $HOME/.local/opt/keypairs-v0.6.5/bin
pkg_install() {
# $HOME/.local/opt/keypairs-v0.6.5/bin
- mkdir -p "$
pkg_src_bin
"
+ mkdir -p "$
(dirname $pkg_src_cmd)
"
# mv ./keypairs* "$HOME/.local/opt/keypairs-v0.6.5/bin/keypairs"
mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
# mv ./keypairs* "$HOME/.local/opt/keypairs-v0.6.5/bin/keypairs"
mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
diff --git
a/keypairs/releases.js
b/keypairs/releases.js
index 5204dbca4b3df91fa339ed45815433a9736bd189..ec0fb13d5d067ba19d23c6b9c671f1717a004199 100644
(file)
--- a/
keypairs/releases.js
+++ b/
keypairs/releases.js
@@
-13,6
+13,6
@@
module.exports = function (request) {
if (module === require.main) {
module.exports(require('@root/request')).then(function (all) {
all = require('../_webi/normalize.js')(all);
if (module === require.main) {
module.exports(require('@root/request')).then(function (all) {
all = require('../_webi/normalize.js')(all);
- console.info(JSON.stringify(all));
+ console.info(JSON.stringify(all
, null, 2
));
});
}
});
}
diff --git
a/lf/install.sh
b/lf/install.sh
index 7eaa5fa42c85723f91d2545484092da43ef7dae3..f488eb6b21697f8fef36362ebd98a66660f9b969 100644
(file)
--- a/
lf/install.sh
+++ b/
lf/install.sh
@@
-30,7
+30,7
@@
function __init_lf() {
}
pkg_get_current_version() {
}
pkg_get_current_version() {
- # 'lf version' has output in this format:
+ # 'lf
--
version' has output in this format:
# r21
# This treats it as a minor version number:
# 0.21.0
# r21
# This treats it as a minor version number:
# 0.21.0
diff --git
a/lf/releases.js
b/lf/releases.js
index f92c356eca90911ff6aa2718411315ca877a1cc8..6de6313e87db45bfeb72ed947b43a4678264df5c 100644
(file)
--- a/
lf/releases.js
+++ b/
lf/releases.js
@@
-19,14
+19,7
@@
module.exports = function (request) {
if (module === require.main) {
module.exports(require('@root/request')).then(function (all) {
if (module === require.main) {
module.exports(require('@root/request')).then(function (all) {
- all = require('../_webi/normalize.js')(all);
- all.releases = all.releases
- .filter(function (r) {
- return (
- ['windows', 'macos', 'linux'].includes(r.os) && 'amd64' === r.arch
- );
- })
- .slice(0, 10);
+ all = require('../_webi/normalize.js')._debug(all);
console.info(JSON.stringify(all, null, 2));
});
}
console.info(JSON.stringify(all, null, 2));
});
}