projects
/
webi-installers
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add dotenv
[webi-installers/.git]
/
_webi
/
template.sh
diff --git
a/_webi/template.sh
b/_webi/template.sh
index 4dc0a2ce1c61fae5acf5c4587e71b26e1e9bcd31..a041e41ac3b530cddc2461f8743ef7fd1e855401 100644
(file)
--- a/
_webi/template.sh
+++ b/
_webi/template.sh
@@
-1,6
+1,6
@@
#!/bin/bash
#!/bin/bash
-{
+
function __bootstrap_webi()
{
set -e
set -u
set -e
set -u
@@
-211,7
+211,8
@@
webi_path_add() {
# in case pathman was recently installed and the PATH not updated
mkdir -p "$_webi_tmp"
# in case pathman was recently installed and the PATH not updated
mkdir -p "$_webi_tmp"
- "$HOME/.local/bin/pathman" add "$1" | grep "export" >> "$_webi_tmp/.PATH.env" || true
+ # prevent "too few arguments" output on bash when there are 0 lines of stdout
+ "$HOME/.local/bin/pathman" add "$1" | grep "export" 2>/dev/null >> "$_webi_tmp/.PATH.env" || true
}
# group common pre-install tasks as default
}
# group common pre-install tasks as default
@@
-239,7
+240,8
@@
webi_post_install() {
_webi_enable_exec() {
if [ -n "$(command -v spctl)" ] && [ -n "$(command -v xattr)" ] ; then
_webi_enable_exec() {
if [ -n "$(command -v spctl)" ] && [ -n "$(command -v xattr)" ] ; then
- xattr -r -d com.apple.quarantine "$pkg_src"
+ # note: some packages contain files that cannot be affected by xattr
+ xattr -r -d com.apple.quarantine "$pkg_src" || true
return 0
fi
# TODO need to test that the above actually worked
return 0
fi
# TODO need to test that the above actually worked
@@
-282,12
+284,14
@@
echo "Have a problem? Experience a bug? Please let us know:"
echo " https://github.com/webinstall/packages/issues"
echo ""
echo " https://github.com/webinstall/packages/issues"
echo ""
-{
+
function __init_installer()
{
{{ installer }}
}
{{ installer }}
}
+__init_installer
+
##
##
## END custom override functions
##
##
## END custom override functions
@@
-352,3
+356,5
@@
rm -rf "$WEBI_TMP"
# See? No magic. Just downloading and moving files.
}
# See? No magic. Just downloading and moving files.
}
+
+__bootstrap_webi