diff --git a/README b/README index 4688ad3..3d327ae 100644 --- a/README +++ b/README @@ -46,7 +46,7 @@ To completely remove gvm and all installed Go versions and packages: If that doesn't work see the troubleshooting steps at the bottom of this page. -Mac OSX Requirements +Mac OS X Requirements ==================== Install mercurial from http://mercurial.berkwood.com/ @@ -60,6 +60,13 @@ Linux Requirements sudo apt-get install bison sudo apt-get install gcc +FreeBSD Requirements +==================== + + sudo pkg_add -r bash + sudo pkg_add -r git + sudo pkg_add -r mercurial + Troubleshooting =============== Sometimes especially during upgrades the state of gvm's files can get mixed up. This is mostly true for upgrade from older version than 0.0.8. Changes are slowing down and a LTR is imminent. But for now `rm -rf ~/.gvm` will always remove gvm. Stay tuned! diff --git a/README.md b/README.md index d241417..3a66119 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ To completely remove gvm and all installed Go versions and packages: gvm implode -Mac OSX Requirements +Mac OS X Requirements ==================== Install mercurial from http://mercurial.berkwood.com/ @@ -54,4 +54,12 @@ Linux Requirements sudo apt-get install make sudo apt-get install binutils sudo apt-get install bison - sudo apt-get install gcc \ No newline at end of file + sudo apt-get install gcc + +FreeBSD Requirements +==================== + + sudo pkg_add -r bash + sudo pkg_add -r git + sudo pkg_add -r mercurial + diff --git a/bin/gvm b/bin/gvm index fcf5bf1..e5d1a60 100755 --- a/bin/gvm +++ b/bin/gvm @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [ -z "$GVM_ROOT" ]; then tput sgr0 tput setaf 1 diff --git a/bin/gvm-prompt b/bin/gvm-prompt index eaad4ab..62ff3cb 100755 --- a/bin/gvm-prompt +++ b/bin/gvm-prompt @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function gvm_prompt() { if [[ "$1" == "g" ]]; then echo $gvm_go_name diff --git a/binscripts/gvm-installer b/binscripts/gvm-installer index b40f550..5f5caed 100755 --- a/binscripts/gvm-installer +++ b/binscripts/gvm-installer @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash display_error() { tput sgr0 tput setaf 1 diff --git a/scripts/alias b/scripts/alias index 934144e..c47e762 100755 --- a/scripts/alias +++ b/scripts/alias @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions command=$1 diff --git a/scripts/alias-create b/scripts/alias-create index 2398b10..04648ad 100755 --- a/scripts/alias-create +++ b/scripts/alias-create @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions [[ $1 != "" ]] || diff --git a/scripts/alias-delete b/scripts/alias-delete index 37e3b27..1efffd1 100755 --- a/scripts/alias-delete +++ b/scripts/alias-delete @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions [[ $1 != "" ]] || diff --git a/scripts/alias-list b/scripts/alias-list index 8f7f208..160444f 100755 --- a/scripts/alias-list +++ b/scripts/alias-list @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions echo diff --git a/scripts/cross b/scripts/cross index 61230cd..32e89da 100755 --- a/scripts/cross +++ b/scripts/cross @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions display_usage() { diff --git a/scripts/diff b/scripts/diff index 874f014..1961ed2 100755 --- a/scripts/diff +++ b/scripts/diff @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions version=$1 diff --git a/scripts/env/gvm b/scripts/env/gvm index 75ad254..01b94f4 100644 --- a/scripts/env/gvm +++ b/scripts/env/gvm @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions || return 1 function gvm() { diff --git a/scripts/env/pkgset-use b/scripts/env/pkgset-use index 0195764..9972b59 100644 --- a/scripts/env/pkgset-use +++ b/scripts/env/pkgset-use @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function gvm_pkgset_use() { [[ "$1" != "" ]] || display_error "Please specify a package set" || return 1 diff --git a/scripts/env/use b/scripts/env/use index 7b1b07d..2b37598 100644 --- a/scripts/env/use +++ b/scripts/env/use @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function gvm_use() { [[ "$1" != "" ]] || display_error "Please specifiy the version" || return 1 diff --git a/scripts/function/tools b/scripts/function/tools index 6cdd140..93442bb 100644 --- a/scripts/function/tools +++ b/scripts/function/tools @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash LS_ERROR="GVM couldn't find ls" GREP_ERROR="GVM couldn't find grep" SORT_ERROR="GVM couldn't find sort" diff --git a/scripts/functions b/scripts/functions index 22d6d95..ff3117b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash for function in $GVM_ROOT/scripts/function/*; do . $function done diff --git a/scripts/get b/scripts/get index d242909..56cb7aa 100755 --- a/scripts/get +++ b/scripts/get @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions [[ -d $GVM_ROOT/.git ]] || mv $GVM_ROOT/git.bak $GVM_ROOT/.git &> /dev/null || diff --git a/scripts/gvm-check b/scripts/gvm-check index b2cedfb..c7be0e7 100755 --- a/scripts/gvm-check +++ b/scripts/gvm-check @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions # Check for hg diff --git a/scripts/install b/scripts/install index a49aad1..40bb9cd 100755 --- a/scripts/install +++ b/scripts/install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions function show_usage() { diff --git a/scripts/list b/scripts/list index 1abf281..210380a 100755 --- a/scripts/list +++ b/scripts/list @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions echo diff --git a/scripts/listall b/scripts/listall index f41cd4f..c2f41f2 100755 --- a/scripts/listall +++ b/scripts/listall @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions function show_usage() { diff --git a/scripts/pkgset b/scripts/pkgset index cddbc3b..f67f92a 100755 --- a/scripts/pkgset +++ b/scripts/pkgset @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions [[ $gvm_go_name != "" ]] || diff --git a/scripts/pkgset-create b/scripts/pkgset-create index fc8a051..fe4101b 100755 --- a/scripts/pkgset-create +++ b/scripts/pkgset-create @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions [[ $1 != "" ]] || diff --git a/scripts/pkgset-delete b/scripts/pkgset-delete index ab2d87c..3136411 100755 --- a/scripts/pkgset-delete +++ b/scripts/pkgset-delete @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions [[ $gvm_go_name != "" ]] || diff --git a/scripts/pkgset-empty b/scripts/pkgset-empty index 1de11b1..a942bb5 100755 --- a/scripts/pkgset-empty +++ b/scripts/pkgset-empty @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions [[ $gvm_pkgset_name != "" ]] || diff --git a/scripts/pkgset-list b/scripts/pkgset-list index 081a78a..3fda1cf 100755 --- a/scripts/pkgset-list +++ b/scripts/pkgset-list @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions echo diff --git a/scripts/templates/binary b/scripts/templates/binary index 98018b4..80fef9f 100644 --- a/scripts/templates/binary +++ b/scripts/templates/binary @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions/tools echo $1 | sed -n -e '/_.*_/ p' | $GREP_PATH "_" &> /dev/null if [ "$?" == "0" ]; then diff --git a/scripts/uninstall b/scripts/uninstall index 0404d8f..f429a62 100755 --- a/scripts/uninstall +++ b/scripts/uninstall @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions [[ "$1" == "" ]] && diff --git a/scripts/update b/scripts/update index 855b126..9952029 100755 --- a/scripts/update +++ b/scripts/update @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . $GVM_ROOT/scripts/functions cd $GVM_ROOT/archive/go &> /dev/null || diff --git a/tests/gvm_version b/tests/gvm_version index 69113bb..46becea 100755 --- a/tests/gvm_version +++ b/tests/gvm_version @@ -1,4 +1,4 @@ -#!/bin/bash -ex +#!/usr/bin/env bash -ex TEST_OUTPUT=`gvm version` [ "$TEST_OUTPUT" != "" ] echo "Success!"