From 4cfe1596c80f20455a8c0f3d5bc22c3ddd097e48 Mon Sep 17 00:00:00 2001 From: parazyd Date: Wed, 24 Jan 2018 15:44:15 +0100 Subject: [PATCH] Apply binary golang installation in its function. --- decode.blend | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/decode.blend b/decode.blend index a01e1bd..32a823b 100644 --- a/decode.blend +++ b/decode.blend @@ -37,7 +37,7 @@ blend_postinst() { notice "executing $blend_name postinst" - nopackage=(musl tomb golang stem netdata multichain) + nopackage=(musl tomb golang tordam stem netdata multichain) for app in $nopackage; do blend_install_${app} || zerr done || zerr @@ -108,24 +108,17 @@ EOF ## {{{ blend_install_golang() blend_install_golang() { fn blend_install_golang - req=(strapdir golang_version golang_url) + req=(strapdir golang_url) ckreq || return 1 - notice "grabbing golang tarball" - pushd "$strapdir"/usr/local - sudo wget "${golang_url}" - popd - notice "installing golang in $strapdir" cat </dev/null #!/bin/sh cd /usr/local -tar xvf $(basename ${golang_url}) +wget ${golang_url} || exit 1 +tar xf $(basename ${golang_url}) rm -f $(basename ${golang_url}) -cd go/src -CGO_ENABLED=0 ./make.bash - ln -snvf /usr/local/go/bin/go /usr/local/bin/go ln -snvf /usr/local/go/bin/gofmt /usr/local/bin/gofmt EOF