bash
/
shell-base
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: bash:49913cf7143016c580c40fa6908680f1b53a881e
Branches Tags
bash:master
..
compare: bash:057b8ad9dd02e82a807906dd9bb49b3b2091c934
Branches Tags
bash:master

No commits in common. "49913cf7143016c580c40fa6908680f1b53a881e" and "057b8ad9dd02e82a807906dd9bb49b3b2091c934" have entirely different histories.
49913cf714 ... 057b8ad9dd

4 changed files with 17 additions and 24 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,4 +3,3 @@
/ssh/config/_config /ssh/config/_config
base.code-workspace base.code-workspace
/module.lib /module.lib
load/ucishellgiturl

5
load/alias/00-basic
View File

@ -65,12 +65,9 @@ alias umountf="sudo umount -l"
alias loginust="loginctl show-user $USER" alias loginust="loginctl show-user $USER"
# alias to add for live user # alias to add for live user
if [ -v PS1 ]; then if [ -v PS1 ]; then
alias dfind="_find -t d -d 0 -n " alias dfind="_find -t d -d 0 -n "
alias sdfind="_find -s -t d -d 0 -n " alias sdfind="_find -s -t d -d 0 -n "
fi fi
alias portl="ss -tunl | grep"
alias ipg="ip addr show | grep -A1 "

4
modules/uci-shell-install.lib
View File

@ -19,7 +19,6 @@
# chmod -R +r $rpath # chmod -R +r $rpath
# } # }
# must! be run as sudo # must! be run as sudo
install_shell_base () { install_shell_base () {
if [[ $1 == "-f" ]];then if [[ $1 == "-f" ]];then
@ -54,9 +53,6 @@ install_shell_base () {
chmod -R +r /shell chmod -R +r /shell
/bin/bash /shell/base/install/install.sh ${1:-1000} /bin/bash /shell/base/install/install.sh ${1:-1000}
# TODO now add BASH_SHELL_GIT_URL=$BASH_SHELL_GIT_URL to load directory
echo "export BASH_SHELL_GIT_URL=$BASH_SHELL_GIT_URL" > $BASH_SHELL_BASE/load/ucishellgiturl
} }
# # if script was executed then call the function # # if script was executed then call the function

15
modules/utility/copy.lib
View File

@ -12,7 +12,7 @@ copy () {
local SHOST; local DHOST; local sshargs; local args local SHOST; local DHOST; local sshargs; local args
local SRC; local DEST; local mirror; local quiet; local Mirror local SRC; local DEST; local mirror; local quiet; local Mirror
local SPATH; local DPATH; local exec; local list; local verbose local SPATH; local DPATH; local exec; local list; local verbose
local usesudo;local cmd;local noconfirm;local insert; local sargs local usesudo;local cmd;local noconfirm;local insert
args=() args=()
@ -172,18 +172,19 @@ EOF
[[ ! $SHOST ]] && SPATH=$(realpath $SPATH) [[ ! $SHOST ]] && SPATH=$(realpath $SPATH)
[[ ! $DHOST ]] && DPATH=$(realpath $DPATH) [[ ! $DHOST ]] && DPATH=$(realpath $DPATH)
# parse ssh arguments from the rest
debug $( ( IFS=$','; echo all arguments: "$*" ) ) debug $( ( IFS=$','; echo all arguments: "$*" ) )
for ((d=1; d<$#+1; ++d)); do for ((d=1; d<$#; ++d)); do
# echo in loop $d, ${!d} [[ ${!d} == "---" ]] && break
[[ ${!d} == "--" ]] && sargs=true && break
done done
if [[ $sargs ]]; then # if there are extra ssh arguments if [[ $d -lt $# ]]; then # if there are extra ssh arguments
debug found --- at $d
sshargs=("${@:$d+1:$#}") sshargs=("${@:$d+1:$#}")
debug $( ( IFS=$','; echo "ssh arguments: ${sshargs[*]}" ) ) debug $( ( IFS=$','; echo "ssh arguments: ${sshargs[*]}" ) )
args=("${@:1:$d-1}") args+=("${@:1:$d-1}")
debug $( ( IFS=$','; echo remaining arguments to parse: "$*" ) ) debug $( ( IFS=$','; echo remaining arguments to parse: "$*" ) )
else else
args=("${@:1}") args+=("${@:1}")
fi fi
[[ $DHOST || $SHOST ]] && args+=( "$(remove_end_spaces "-e '$(ssh -l "${sshargs[*]}")'")") [[ $DHOST || $SHOST ]] && args+=( "$(remove_end_spaces "-e '$(ssh -l "${sshargs[*]}")'")")