Circuit-Forge/cf-node-bootstrap
6
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/pyr0ball/PRbL-bashrc into develop

Browse source
This commit is contained in:
pyr0ball 2024-09-22 14:11:32 -07:00
commit 0a4b9dc719
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
extras/golang.install
View file

@ -11,6 +11,11 @@ req_go_ver="1.19"
golang_bashrc="# Golang system path setup golang_bashrc="# Golang system path setup
export PATH=\$PATH:/usr/local/go/bin export PATH=\$PATH:/usr/local/go/bin
" "
if [[ $OSTYPE == linux-gnu ]] ; then
sys_type="linux"
else
sys_type="$OSTYPE"
fi
# Source PRbL Functions locally or retrieve from online # Source PRbL Functions locally or retrieve from online
if [ ! -z $prbl_functions ] ; then if [ ! -z $prbl_functions ] ; then
@ -140,7 +145,7 @@ install(){
esac esac
fi fi
local _golang_html=$(/usr/bin/curl -ks "https://go.dev/dl/" | grep $sys_arch | grep $req_go_ver | head -n 1) local _golang_html=$(/usr/bin/curl -ks "https://go.dev/dl/" | grep $sys_type | grep $sys_arch | grep $req_go_ver | head -n 1)
local golang_current=$(strip-html-tags "$_golang_html") local golang_current=$(strip-html-tags "$_golang_html")
#golang_current=$(echo "$golang_current" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') #golang_current=$(echo "$golang_current" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
export tmp_dir=`mktemp -d /tmp/selfextract.XXXXXX` export tmp_dir=`mktemp -d /tmp/selfextract.XXXXXX`

2
lib/skel/.bashrc.d/11-quickinfo.bashrc
View file

@ -193,7 +193,7 @@ fi
# TODO: optimize this to run after time delay using timestamp in settings # TODO: optimize this to run after time delay using timestamp in settings
set_spinner spinner19 set_spinner spinner19
#spin "eval $(wan_ip=$(wget -qO- http://ipecho.net/plain \| xargs echo ))" #spin "eval $(wan_ip=$(wget -qO- http://ipecho.net/plain \| xargs echo ))"
spin read -r wan_ip < <(wget -qO- https://ident.me/) spin read -r wan_ip < <(wget -qO- http://ipecho.net/plain \| xargs echo)
# Checks memory usage # Checks memory usage
mem_usage=$(free -m | grep Mem | awk '{print $3"M/"$2"M"}') mem_usage=$(free -m | grep Mem | awk '{print $3"M/"$2"M"}')