minor modules cleanup
parent
9eaef445af
commit
2454f268ca
|
@ -10,30 +10,30 @@
|
|||
|
||||
bundle () {
|
||||
|
||||
local file
|
||||
local file
|
||||
|
||||
if [[ $1 == "-m" ]]; then
|
||||
if [[ $1 == "-m" ]]; then
|
||||
shift 1
|
||||
file=$(module_find $1)
|
||||
else
|
||||
file=$1
|
||||
fi
|
||||
fi
|
||||
|
||||
[[ ! -f $file ]] && return 1
|
||||
module_load file
|
||||
[[ ! -f $file ]] && return 1
|
||||
module_load file
|
||||
|
||||
if [[ ! $2 == "__recurse__" ]]; then
|
||||
tmp_file=$( mktemp -t TEMP_FILE_bundle.XXXXXXXX )
|
||||
chmod 600 "$tmp_file"
|
||||
\cp $file $tmp_file
|
||||
else
|
||||
tmp_file=$file
|
||||
fi
|
||||
# echo current temp file: $tmp_file
|
||||
modules=$(sed -n -e 's/^module_load //p' < $tmp_file)
|
||||
# echo found: $modules
|
||||
# return
|
||||
if [[ $modules ]]; then
|
||||
if [[ ! $2 == "__recurse__" ]]; then
|
||||
tmp_file=$( mktemp -t TEMP_FILE_bundle.XXXXXXXX )
|
||||
chmod 600 "$tmp_file"
|
||||
\cp $file $tmp_file
|
||||
else
|
||||
tmp_file=$file
|
||||
fi
|
||||
# echo current temp file: $tmp_file
|
||||
modules=$(sed -n -e 's/^module_load //p' < $tmp_file)
|
||||
# echo found: $modules
|
||||
# return
|
||||
if [[ $modules ]]; then
|
||||
# echo Modules: $modules
|
||||
sed -i '/module_load/d' $tmp_file
|
||||
for module in $(printf '%s\n' "${modules[@]}"|tac);
|
||||
|
@ -43,9 +43,9 @@ if [[ $modules ]]; then
|
|||
prepend_file $(module_find $module) $tmp_file
|
||||
done
|
||||
bundle $tmp_file __recurse__
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ! $2 == "__recurse__" ]]; then
|
||||
if [[ ! $2 == "__recurse__" ]]; then
|
||||
if [[ $2 ]]; then
|
||||
\cp $tmp_file $2
|
||||
# echo $2
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
isAbsPath() {
|
||||
if [[ "${1:0:1}" == / || "${1:0:2}" == ~[/a-z] ]]
|
||||
then
|
||||
echo "true"
|
||||
echo $1
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
#!/bin/bash
|
||||
# if you have run into github api anonymous access limits which happens during debugging/dev then add user and token here or sourced from a separate file
|
||||
# set to location for tokens in file
|
||||
# DEPRECATED use python based lastversion https://github.com/dvershinin/lastversion
|
||||
source ~/githubapitoken
|
||||
|
||||
if [ "$GITHUB_TOKEN" != "" ]; then
|
||||
echo using access token with script
|
||||
echo $GITHUB_USER $GITHUB_TOKEN
|
||||
fi
|
||||
|
||||
DIR=$(dirname "$(readlink -f "$0")") || exit
|
||||
|
||||
ORG=$1
|
||||
REPO=$2
|
||||
TYPE=$3
|
||||
NAME=$4
|
||||
EXCLUDE=$5
|
||||
|
||||
URL=$(curl -s https://api.github.com/repos/$ORG/$REPO/releases/latest \
|
||||
# | grep 'browser_download_url.*'$TYPE''
|
||||
# | sed -n -e 's/^.*: //p' \
|
||||
# | sed 's/"//g'
|
||||
)
|
||||
|
||||
|
||||
echo "Pulling $URL"
|
||||
TODO put back tokens here.
|
||||
# wget $URL -O $NAME.$TYPE
|
||||
# chmod +x $DIR/$NAME.$TYPE
|
||||
# ln -s $DIR/$NAME.$TYPE /opt/bin/$NAME
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
module_load confirm
|
||||
module_load helpers
|
||||
|
||||
alias aud="acladduserdir"
|
||||
#source ${BASH_SOURCE[0]}/confirm.sh
|
||||
|
||||
# Usage:
|
||||
|
|
Loading…
Reference in New Issue