X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=_webi%2Ftemplate.sh;h=274bfa17d01fc107a625e1b296d7cf7003c91f2f;hb=72406c4e0d438b76da054be8d5eff42d08312498;hp=6c166542929a6b2dc6df1917bec3892397867d74;hpb=7e925a988d5780f6872e5914e29b50e087319502;p=webi-installers%2F.git diff --git a/_webi/template.sh b/_webi/template.sh index 6c16654..274bfa1 100644 --- a/_webi/template.sh +++ b/_webi/template.sh @@ -7,8 +7,10 @@ set -u #set -x #WEBI_PKG= -#WEBI_NAME= +#PKG_NAME= # TODO should this be BASEURL instead? +#WEBI_OS= +#WEBI_ARCH= #WEBI_HOST= #WEBI_RELEASES= #WEBI_CSV= @@ -25,6 +27,9 @@ set -u #WEBI_FORMATS= #WEBI_PKG_URL= #WEBI_PKG_FILE= +#PKG_OSES= +#PKG_ARCHES= +#PKG_FORMATS= WEBI_UA="$(uname -a)" export WEBI_HOST @@ -102,7 +107,7 @@ webi_check() { exit 0 else if [ "$my_current_cmd" != "$pkg_dst_cmd" ]; then - echo "WARN: possible conflict between $my_canonical_name and $pkg_current_version at $my_current_cmd" + >&2 echo "WARN: possible conflict between $my_canonical_name and $pkg_current_version at $my_current_cmd" fi if [ -x "$pkg_src_cmd" ]; then webi_link @@ -121,14 +126,12 @@ webi_download() { else if [ "error" == "$WEBI_CHANNEL" ]; then # TODO pass back requested OS / Arch / Version - echo "Error: no '$WEBI_NAME' release found for the given OS and architecture by that tag or version" - echo " (check that the package name and version are correct)" - echo "See $WEBI_RELEASES" - echo " WEBI_PKG=$WEBI_PKG" - echo " WEBI_NAME=$WEBI_NAME" - echo " WEBI_VERSION=$WEBI_VERSION" - echo " WEBI_EXT=$WEBI_EXT" - echo " WEBI_FORMATS=$WEBI_FORMATS" + >&2 echo "Error: no '$PKG_NAME' release for '$WEBI_OS' on '$WEBI_ARCH' as one of '$WEBI_FORMATS' by the tag '$WEBI_TAG'" + >&2 echo " '$PKG_NAME' is available for '$PKG_OSES' on '$PKG_ARCHES' as one of '$PKG_FORMATS'" + >&2 echo " (check that the package name and version are correct)" + >&2 echo "" + >&2 echo " Double check at $(echo "$WEBI_RELEASES" | sed 's:\?.*::')" + >&2 echo "" exit 1 fi my_url="$WEBI_PKG_URL" @@ -144,7 +147,8 @@ webi_download() { return 0 fi - echo "Downloading $WEBI_NAME to $my_dl" + echo "Downloading $PKG_NAME from" + echo "$my_url" # It's only 2020, we can't expect to have reliable CLI tools # to tell us the size of a file as part of a base system... @@ -154,7 +158,7 @@ webi_download() { set +e wget -q --show-progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part" if ! [ $? -eq 0 ]; then - echo "failed to download from $WEBI_PKG_URL" + >&2 echo "failed to download from $WEBI_PKG_URL" exit 1 fi set -e @@ -163,8 +167,10 @@ webi_download() { # TODO curl -fsSL --remote-name --remote-header-name --write-out "$my_url" curl -fSL -H "User-Agent: curl $WEBI_UA" "$my_url" -o "$my_dl.part" fi - mv "$my_dl.part" "$my_dl" + + echo "" + echo "Saved as $my_dl" } # detect which archives can be used @@ -177,8 +183,8 @@ webi_extract() { echo "Extracting $HOME/Downloads/$WEBI_PKG_FILE" unzip "$HOME/Downloads/$WEBI_PKG_FILE" > __unzip__.log elif [ "exe" == "$WEBI_EXT" ]; then - # do nothing (but don't leave an empty if block either) - true + echo "Moving $HOME/Downloads/$WEBI_PKG_FILE" + mv "$HOME/Downloads/$WEBI_PKG_FILE" . elif [ "xz" == "$WEBI_EXT" ]; then echo "Inflating $HOME/Downloads/$WEBI_PKG_FILE" unxz -c "$HOME/Downloads/$WEBI_PKG_FILE" > $(basename "$WEBI_PKG_FILE") @@ -232,6 +238,32 @@ webi_post_install() { webi_path_add "$(dirname "$pkg_dst_cmd")" } +_webi_enable_exec() { + if [ -n "$(command -v spctl)" ] && [ -n "$(command -v xattr)" ] ; then + xattr -r -d com.apple.quarantine "$pkg_src" + return 0 + fi + # TODO need to test that the above actually worked + # (and proceed to this below if it did not) + if [ -n "$(command -v spctl)" ]; then + echo "Checking permission to execute '$pkg_cmd_name' on macOS 11+" + set +e + is_allowed="$(spctl -a "$pkg_src_cmd" 2>&1 | grep valid)" + set -e + if [ -z "$is_allowed" ]; then + echo "" + echo "##########################################" + echo "# IMPORTANT: Permission Grant Required #" + echo "##########################################" + echo "" + echo "Requesting permission to execute '$pkg_cmd_name' on macOS 10.14+" + echo "" + sleep 3 + spctl --add "$pkg_src_cmd" + fi + fi +} + # a friendly message when all is well, showing the final install path in $HOME/.local _webi_done_message() { echo "Installed $(_webi_canonical_name) as $pkg_dst_cmd" @@ -245,6 +277,12 @@ _webi_done_message() { WEBI_SINGLE= +echo "" +echo "Thanks for using webi to install '$PKG_NAME' on '$WEBI_OS/$WEBI_ARCH'." +echo "Have a problem? Experience a bug? Please let us know:" +echo " https://github.com/webinstall/packages/issues" +echo "" + { {{ installer }} @@ -259,13 +297,14 @@ WEBI_SINGLE= # run everything with defaults or overrides as needed if [ -n "$(command -v pkg_get_current_version)" ]; then - pkg_cmd_name="${pkg_cmd_name:-$WEBI_NAME}" + pkg_cmd_name="${pkg_cmd_name:-$PKG_NAME}" if [ -n "$WEBI_SINGLE" ]; then pkg_dst_cmd="${pkg_dst_cmd:-$HOME/.local/bin/$pkg_cmd_name}" pkg_dst="$pkg_dst_cmd" # "$(dirname "$(dirname $pkg_dst_cmd)")" - pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/xbin/$pkg_cmd_name-$WEBI_VERSION}" + #pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION/bin/$pkg_cmd_name-v$WEBI_VERSION}" + pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION/bin/$pkg_cmd_name}" pkg_src="$pkg_src_cmd" # "$(dirname "$(dirname $pkg_src_cmd)")" else pkg_dst="${pkg_dst:-$HOME/.local/opt/$pkg_cmd_name}" @@ -286,6 +325,7 @@ if [ -n "$(command -v pkg_get_current_version)" ]; then webi_link + _webi_enable_exec pushd "$WEBI_TMP" 2>&1 >/dev/null [ -n "$(command -v pkg_post_install)" ] && pkg_post_install || webi_post_install popd 2>&1 >/dev/null @@ -299,7 +339,7 @@ fi webi_path_add "$HOME/.local/bin" if [ -z "${_WEBI_CHILD:-}" ] && [ -f "\$_webi_tmp/.PATH.env" ]; then - echo "You need to update your PATH to use $WEBI_NAME:" + echo "You need to update your PATH to use $PKG_NAME:" echo "" cat "$_webi_tmp/.PATH.env" | sort -u rm -f "$_webi_tmp/.PATH.env"