Compare commits
No commits in common. "d497156be9d1444e69e2ed52b1fd5a14dc048cd2" and "ca8ab01a43bba776e4bf6b3c33842f03ba7bfc19" have entirely different histories.
d497156be9
...
ca8ab01a43
|
@ -8,9 +8,9 @@ uci_bash_shell_install () {
|
||||||
echo "Detected The UCI BASH Shell install directory: BASH_INSTALL_DIR=$install_dir"
|
echo "Detected The UCI BASH Shell install directory: BASH_INSTALL_DIR=$install_dir"
|
||||||
echo "Detected The UCI BASH Shell base directory: BASH_SHELL_BASE=$BASH_SHELL_BASE"
|
echo "Detected The UCI BASH Shell base directory: BASH_SHELL_BASE=$BASH_SHELL_BASE"
|
||||||
[[ $EUID -ne 0 ]] && usesudo=sudo
|
[[ $EUID -ne 0 ]] && usesudo=sudo
|
||||||
$usesudo -m $SHELL $install_dir/scripts/copy-etc.sh
|
$usesudo $SHELL $install_dir/scripts/copy-etc.sh
|
||||||
$usesudo -m $SHELL $install_dir/scripts/copy-root.sh
|
$usesudo $SHELL $install_dir/scripts/copy-root.sh
|
||||||
[[ $1 ]] && [[ $(id -u $1 2> /dev/null) ]] && $usesudo -m $SHELL $install_dir/scripts/copy-user.sh "$@"
|
[[ $1 ]] && [[ $(id -u $1 2> /dev/null) ]] && $usesudo $SHELL $install_dir/scripts/copy-user.sh "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# # if script was executed then call the function
|
# # if script was executed then call the function
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
alias gitdis="git clean -df"
|
|
|
@ -21,10 +21,10 @@
|
||||||
|
|
||||||
# must! be run as sudo
|
# must! be run as sudo
|
||||||
install_shell_base () {
|
install_shell_base () {
|
||||||
if [[ $BASH_SHELL_BASE ]] && [[ -d $BASH_SHELL_BASE ]]; then
|
if [[ $BASH_SHELL_BASE ]]; then
|
||||||
echo appears that UCI shell base is already installed at $BASH_SHELL_BASE
|
echo appears that UCI shell base is already installed at $BASH_SHELL_BASE
|
||||||
echo upgrade instead using: 'module_load uci-shell-install; update_shell_base'
|
echo upgrade instead using: 'module_load uci-shell-install; update_shell_base'
|
||||||
[[ $1 == "-f" ]] && { shift; echo forcing reinstall; } || return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if [[ ! $BASH_SHELL_GIT_URL ]]; then
|
if [[ ! $BASH_SHELL_GIT_URL ]]; then
|
||||||
echo BASH_SHELL_GIT_URL must be set before install can proceed
|
echo BASH_SHELL_GIT_URL must be set before install can proceed
|
||||||
|
|
|
@ -73,11 +73,10 @@ touch $rfse
|
||||||
[[ $delete ]] && rm $rfse
|
[[ $delete ]] && rm $rfse
|
||||||
cat <<EOF > $rfse
|
cat <<EOF > $rfse
|
||||||
.[Tt]rash*
|
.[Tt]rash*
|
||||||
tmp/*
|
tmp/
|
||||||
node_modules
|
cache/
|
||||||
[Cc]ache/*
|
log/
|
||||||
logs/*
|
log[s]/
|
||||||
log/*
|
|
||||||
lost+found
|
lost+found
|
||||||
EOF
|
EOF
|
||||||
if [[ $list ]];then
|
if [[ $list ]];then
|
||||||
|
|
Loading…
Reference in New Issue