luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

install.sh: Improve structure and logging

Browse source
This commit is contained in:
Anmol Sethi 2022-11-14 04:10:40 -08:00
parent 8099bc5640
commit 81277e7589
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ci/release/_install.sh
View file

@ -162,6 +162,7 @@ main() {
VERSION=${VERSION:-latest} VERSION=${VERSION:-latest}
if [ "$VERSION" = latest ]; then if [ "$VERSION" = latest ]; then
header "fetching latest release info"
fetch_release_info fetch_release_info
fi fi
@ -171,11 +172,12 @@ main() {
install() { install() {
install_d2 install_d2
if [ "${TALA-}" ]; then if [ "${TALA-}" ]; then
install_tala # Run in subshell to avoid overwriting VERSION.
( install_tala )
fi fi
COLOR=2 header success COLOR=2 header success
log "Standalone release $ARCHIVE has been successfully installed into $PREFIX" log "d2-$VERSION-$OS-$ARCH has been successfully installed into $PREFIX"
if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then
logcat >&2 <<EOF logcat >&2 <<EOF
Extend your path to use d2: Extend your path to use d2:
@ -201,12 +203,13 @@ install_d2() {
fi fi
fi fi
header "installing d2-$VERSION"
install_standalone_d2 install_standalone_d2
} }
install_standalone_d2() { install_standalone_d2() {
ARCHIVE="d2-$VERSION-$OS-$ARCH.tar.gz" ARCHIVE="d2-$VERSION-$OS-$ARCH.tar.gz"
header "installing standalone release $ARCHIVE from github" log "installing standalone release $ARCHIVE from github"
fetch_release_info fetch_release_info
asset_line=$(cat "$RELEASE_INFO" | grep -n "$ARCHIVE" | cut -d: -f1 | head -n1) asset_line=$(cat "$RELEASE_INFO" | grep -n "$ARCHIVE" | cut -d: -f1 | head -n1)
@ -228,12 +231,12 @@ install_tala() {
install_standalone_tala() { install_standalone_tala() {
REPO="${REPO_TALA:-terrastruct/TALA}" REPO="${REPO_TALA:-terrastruct/TALA}"
VERSION=${TALA:-latest} VERSION=$TALA
RELEASE_INFO= RELEASE_INFO=
fetch_release_info fetch_release_info
ARCHIVE="d2plugin-tala-$VERSION-$OS-$ARCH.tar.gz" ARCHIVE="d2plugin-tala-$VERSION-$OS-$ARCH.tar.gz"
header "installing standalone release $ARCHIVE from github" log "installing standalone release $ARCHIVE from github"
asset_line=$(cat "$RELEASE_INFO" | grep -n "$ARCHIVE" | cut -d: -f1 | head -n1) asset_line=$(cat "$RELEASE_INFO" | grep -n "$ARCHIVE" | cut -d: -f1 | head -n1)
asset_url=$(sed -n $((asset_line-3))p "$RELEASE_INFO" | sed 's/^.*: "\(.*\)",$/\1/g') asset_url=$(sed -n $((asset_line-3))p "$RELEASE_INFO" | sed 's/^.*: "\(.*\)",$/\1/g')
@ -274,11 +277,12 @@ uninstall() {
} }
uninstall_d2() { uninstall_d2() {
header "uninstalling d2-$INSTALLED_VERSION"
uninstall_standalone_d2 uninstall_standalone_d2
} }
uninstall_standalone_d2() { uninstall_standalone_d2() {
header "uninstalling standalone release d2-$INSTALLED_VERSION" log "uninstalling standalone release of d2-$INSTALLED_VERSION"
if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then
echoerr "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION" echoerr "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION"
@ -299,7 +303,7 @@ uninstall_tala() {
} }
uninstall_standalone_tala() { uninstall_standalone_tala() {
header "uninstalling standalone release d2plugin-tala-$INSTALLED_VERSION" log "uninstalling standalone release d2plugin-tala-$INSTALLED_VERSION"
if [ ! -e "$INSTALL_DIR/d2plugin-tala-$INSTALLED_VERSION" ]; then if [ ! -e "$INSTALL_DIR/d2plugin-tala-$INSTALLED_VERSION" ]; then
echoerr "missing standalone install release directory $INSTALL_DIR/d2plugin-tala-$INSTALLED_VERSION" echoerr "missing standalone install release directory $INSTALL_DIR/d2plugin-tala-$INSTALLED_VERSION"

18
install.sh
View file

@ -572,6 +572,7 @@ main() {
VERSION=${VERSION:-latest} VERSION=${VERSION:-latest}
if [ "$VERSION" = latest ]; then if [ "$VERSION" = latest ]; then
header "fetching latest release info"
fetch_release_info fetch_release_info
fi fi
@ -581,11 +582,12 @@ main() {
install() { install() {
install_d2 install_d2
if [ "${TALA-}" ]; then if [ "${TALA-}" ]; then
install_tala # Run in subshell to avoid overwriting VERSION.
( install_tala )
fi fi
COLOR=2 header success COLOR=2 header success
log "Standalone release $ARCHIVE has been successfully installed into $PREFIX" log "d2-$VERSION-$OS-$ARCH has been successfully installed into $PREFIX"
if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then
logcat >&2 <<EOF logcat >&2 <<EOF
Extend your path to use d2: Extend your path to use d2:
@ -611,12 +613,13 @@ install_d2() {
fi fi
fi fi
header "installing d2-$VERSION"
install_standalone_d2 install_standalone_d2
} }
install_standalone_d2() { install_standalone_d2() {
ARCHIVE="d2-$VERSION-$OS-$ARCH.tar.gz" ARCHIVE="d2-$VERSION-$OS-$ARCH.tar.gz"
header "installing standalone release $ARCHIVE from github" log "installing standalone release $ARCHIVE from github"
fetch_release_info fetch_release_info
asset_line=$(cat "$RELEASE_INFO" | grep -n "$ARCHIVE" | cut -d: -f1 | head -n1) asset_line=$(cat "$RELEASE_INFO" | grep -n "$ARCHIVE" | cut -d: -f1 | head -n1)
@ -638,12 +641,12 @@ install_tala() {
install_standalone_tala() { install_standalone_tala() {
REPO="${REPO_TALA:-terrastruct/TALA}" REPO="${REPO_TALA:-terrastruct/TALA}"
VERSION=${TALA:-latest} VERSION=$TALA
RELEASE_INFO= RELEASE_INFO=
fetch_release_info fetch_release_info
ARCHIVE="d2plugin-tala-$VERSION-$OS-$ARCH.tar.gz" ARCHIVE="d2plugin-tala-$VERSION-$OS-$ARCH.tar.gz"
header "installing standalone release $ARCHIVE from github" log "installing standalone release $ARCHIVE from github"
asset_line=$(cat "$RELEASE_INFO" | grep -n "$ARCHIVE" | cut -d: -f1 | head -n1) asset_line=$(cat "$RELEASE_INFO" | grep -n "$ARCHIVE" | cut -d: -f1 | head -n1)
asset_url=$(sed -n $((asset_line-3))p "$RELEASE_INFO" | sed 's/^.*: "\(.*\)",$/\1/g') asset_url=$(sed -n $((asset_line-3))p "$RELEASE_INFO" | sed 's/^.*: "\(.*\)",$/\1/g')
@ -684,11 +687,12 @@ uninstall() {
} }
uninstall_d2() { uninstall_d2() {
header "uninstalling d2-$INSTALLED_VERSION"
uninstall_standalone_d2 uninstall_standalone_d2
} }
uninstall_standalone_d2() { uninstall_standalone_d2() {
header "uninstalling standalone release d2-$INSTALLED_VERSION" log "uninstalling standalone release of d2-$INSTALLED_VERSION"
if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then
echoerr "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION" echoerr "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION"
@ -709,7 +713,7 @@ uninstall_tala() {
} }
uninstall_standalone_tala() { uninstall_standalone_tala() {
header "uninstalling standalone release d2plugin-tala-$INSTALLED_VERSION" log "uninstalling standalone release d2plugin-tala-$INSTALLED_VERSION"
if [ ! -e "$INSTALL_DIR/d2plugin-tala-$INSTALLED_VERSION" ]; then if [ ! -e "$INSTALL_DIR/d2plugin-tala-$INSTALLED_VERSION" ]; then
echoerr "missing standalone install release directory $INSTALL_DIR/d2plugin-tala-$INSTALLED_VERSION" echoerr "missing standalone install release directory $INSTALL_DIR/d2plugin-tala-$INSTALLED_VERSION"