Compare commits

..

No commits in common. "d497156be9d1444e69e2ed52b1fd5a14dc048cd2" and "ca8ab01a43bba776e4bf6b3c33842f03ba7bfc19" have entirely different histories.

4 changed files with 9 additions and 11 deletions

View File

@ -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 base directory: BASH_SHELL_BASE=$BASH_SHELL_BASE"
[[ $EUID -ne 0 ]] && usesudo=sudo
$usesudo -m $SHELL $install_dir/scripts/copy-etc.sh
$usesudo -m $SHELL $install_dir/scripts/copy-root.sh
[[ $1 ]] && [[ $(id -u $1 2> /dev/null) ]] && $usesudo -m $SHELL $install_dir/scripts/copy-user.sh "$@"
$usesudo $SHELL $install_dir/scripts/copy-etc.sh
$usesudo $SHELL $install_dir/scripts/copy-root.sh
[[ $1 ]] && [[ $(id -u $1 2> /dev/null) ]] && $usesudo $SHELL $install_dir/scripts/copy-user.sh "$@"
}
# # if script was executed then call the function

View File

@ -1 +0,0 @@
alias gitdis="git clean -df"

View File

@ -21,10 +21,10 @@
# must! be run as sudo
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 upgrade instead using: 'module_load uci-shell-install; update_shell_base'
[[ $1 == "-f" ]] && { shift; echo forcing reinstall; } || return 1
return 1
fi
if [[ ! $BASH_SHELL_GIT_URL ]]; then
echo BASH_SHELL_GIT_URL must be set before install can proceed

View File

@ -73,11 +73,10 @@ touch $rfse
[[ $delete ]] && rm $rfse
cat <<EOF > $rfse
.[Tt]rash*
tmp/*
node_modules
[Cc]ache/*
logs/*
log/*
tmp/
cache/
log/
log[s]/
lost+found
EOF
if [[ $list ]];then