mirror of
https://github.com/DictXiong/dotfiles.git
synced 2026-11-02 10:08:15 +08:00
Compare commits
2 Commits
v1.1
...
v1.2-alpha
| Author | SHA1 | Date | |
|---|---|---|---|
| 8fdd3c477f | |||
| 9a4c9556f6 |
35
.github/workflows/test.yml
vendored
35
.github/workflows/test.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
||||
rev=`git rev-parse HEAD`
|
||||
pwd
|
||||
set -x
|
||||
./install.sh -adl
|
||||
DFS_NO_WALL=0 ./install.sh -adl
|
||||
test `git rev-parse HEAD` = "$rev"
|
||||
|
||||
- name: antigen build
|
||||
@@ -31,13 +31,11 @@ jobs:
|
||||
run: |
|
||||
source tools/test.zsh
|
||||
antigen reset
|
||||
rm -rf $ANTIGEN $HOME/.antigen
|
||||
rm -rf $ANTIGEN $HOME/.antigen $HOME/.config/dotfiles
|
||||
./install.sh -dl
|
||||
|
||||
- name: antigen build with DFS_NO_WALL
|
||||
shell: /bin/zsh -ileo PIPE_FAIL {0}
|
||||
env:
|
||||
DFS_NO_WALL: 1
|
||||
run: |
|
||||
echo $SHELL
|
||||
antigen list
|
||||
@@ -60,7 +58,7 @@ jobs:
|
||||
rev=`git rev-parse HEAD`
|
||||
pwd
|
||||
set -x
|
||||
./install.sh -adl
|
||||
DFS_NO_WALL=0 ./install.sh -adl
|
||||
test `git rev-parse HEAD` = "$rev"
|
||||
|
||||
- name: antigen build
|
||||
@@ -74,13 +72,11 @@ jobs:
|
||||
run: |
|
||||
source tools/test.zsh
|
||||
antigen reset
|
||||
rm -rf $ANTIGEN $HOME/.antigen
|
||||
rm -rf $ANTIGEN $HOME/.antigen $HOME/.config/dotfiles
|
||||
./install.sh -dl
|
||||
|
||||
- name: antigen build with DFS_NO_WALL
|
||||
shell: /bin/zsh -ileo PIPE_FAIL {0}
|
||||
env:
|
||||
DFS_NO_WALL: 1
|
||||
run: |
|
||||
echo $SHELL
|
||||
antigen list
|
||||
@@ -109,10 +105,27 @@ jobs:
|
||||
./install.sh -dal
|
||||
test `git rev-parse HEAD` = "$rev"
|
||||
|
||||
- name: antigen build with DFS_NO_WALL
|
||||
- name: antigen build
|
||||
shell: /bin/zsh -ileo PIPE_FAIL {0}
|
||||
env:
|
||||
DFS_NO_WALL: 1
|
||||
run: |
|
||||
echo $SHELL
|
||||
antigen list
|
||||
|
||||
test-get-dotfiles-cn:
|
||||
name: test of get.dotfiles.cn script
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: checkout repo
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: run the script
|
||||
run: |
|
||||
repo=https://github.com/DictXiong/dotfiles bash tools/get.dotfiles.cn -asl
|
||||
|
||||
- name: run tests
|
||||
shell: /bin/zsh -ileo PIPE_FAIL {0}
|
||||
run: |
|
||||
dfs cd
|
||||
source tools/test.zsh
|
||||
@@ -1,5 +1,3 @@
|
||||
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD5VPD5c/pBtQM5mcKMzJ6vC2jDdVJU6ifkP1EvAeV/dKEyy5hOc+EXC8Ws7bAp3a7twvsQGSqNbeXuAO4PzX2KHhI49KiFyRugo8LsUF3TVVluOXtGWKgw+36TBO3rNFgWOnhw5B4IlNtxo2nk4grCkgEsE6w+Ignd+FrEFec457oal2SPN02TjUfRULaEPSpZTl7cA/5Re9/QmlcYjuyA9zbkO98KYA0M71W/eUcjfjNEaWXjn2pcloakoWwEEdi4v/yJ1Fk+gQYcbpoftxpWmWLvFhDGP+qvTZY5QHxDxiPbc3HDdx0qBvMOQW9XSt0J/L/btnxcZvA1lDtkC2bm8zvHxtLBZ9JBRutMbRhdSgkd3+5DwHDIO0EIUqckgCfX3t7avj5RsPAl0j4V40yB637YQim7saN3FWq43SpR3i6buNbQLPdgy2SDN6fAZcAPWvifE1KG7I2BtmiFFYjAy3iU1KD2Hgn6mIpOOCZOJV30/cf3Oq8ZSDfD7PmDu72yOea3h9JlvkKjjqknnF4NdQ5cy1FuIfyebnF6+ugbdA9UqY9PZdnuwy5RkwkmJwC4AVO3GaOfuQDU61UMSoTfYH1yB8x8HHUQcJzLtfExrYpVPAo89tyN1lcIIBUBoHhNMCwVBZipfV/H41cIxs5wkHsolQ02zZaAX6Cgbii9FQ== home
|
||||
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPmMImRSAhksHUfCwNpcj61izGn0Xkv1KRIuxb0OSdJl pc0/old
|
||||
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4K5S3zDYbxlw7B45zOdmKud95nXU1V6kSxEvbTOsy2 pc1/old
|
||||
@@ -30,3 +28,7 @@ ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJ/+BWST
|
||||
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNvHya5i3GNniGww9Yx5ikos4Z5jevu8zz8hCQi05++SgejFPnbw9UjbHFjODK2M+ZHuhRF5mdf996r4/BxWyP8= pad0/sep
|
||||
|
||||
ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC5gu+U4picxVvCNYjLlmxGLpJl7svj3LklO7jSpwqdrNxlE+/xkx07PJx76AbA77dDM1Dxmm/VOvVQCKTRLTgk= ip14/sep
|
||||
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF52mPmbLEriZ+DfmrMHFtvg2kiO2JpRpitvs7PbJowh home0
|
||||
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhS4voo3K/Dvzqckr0bouO1WkCI5XxswstHWnuuyKBz ltp1-bd
|
||||
|
||||
13
.update.sh
13
.update.sh
@@ -7,6 +7,15 @@ source "$THIS_DIR/tools/common.sh"
|
||||
DFS_UPDATED_RET=${DFS_UPDATED_RET:-0}
|
||||
DFS_UPDATE_CHANNEL=${DFS_UPDATE_CHANNEL:-"main"}
|
||||
|
||||
# send beacon online
|
||||
apost_beacon "sys.online"
|
||||
|
||||
# update dns
|
||||
if [[ "$DFS_DDNS_ENABLE" == "1" ]]; then
|
||||
fmt_info "updating dns ..."
|
||||
"$THIS_DIR/tools/frigg-client.sh" ddns || (fmt_error "failed to update dns" && apost_beacon "dfs.ddns.fail")
|
||||
fi
|
||||
|
||||
# fetch origin
|
||||
cd $DOTFILES
|
||||
git fetch --all --prune
|
||||
@@ -18,7 +27,7 @@ fi
|
||||
|
||||
# get the specified commit id
|
||||
case $DFS_UPDATE_CHANNEL in
|
||||
"main" ) DFS_COMMIT=$(curl -fsSL https://api.beardic.cn/get-var/dfs-commit-id) ;;
|
||||
"main" ) DFS_COMMIT=$(curl $DFS_CURL_OPTIONS -fsSL https://api.beardic.cn/get-var/dfs-commit-id) ;;
|
||||
"dev" ) DFS_COMMIT=$(git rev-parse origin/dev 2> /dev/null) || DFS_COMMIT=$(git rev-parse origin/main) ;;
|
||||
"latest" ) DFS_COMMIT=$(git for-each-ref --sort=-committerdate refs/heads refs/remotes --format='%(objectname)' | head -n 1) ;;
|
||||
* ) fmt_fatal "invalid update channel: $DFS_UPDATE_CHANNEL" ;;
|
||||
@@ -35,7 +44,7 @@ if [[ "$(git rev-parse HEAD)" == "$DFS_COMMIT" ]]; then
|
||||
fmt_info "nothing to do"
|
||||
else
|
||||
fmt_info "checking out to commit $DFS_COMMIT ..."
|
||||
if [[ -z "$DFS_DEV" ]]; then
|
||||
if [[ -z "$DFS_DEV" || "$DFS_DEV" == "0" ]]; then
|
||||
post_beacon "dfs.updated"
|
||||
git -c advice.detachedHead=false checkout $DFS_COMMIT
|
||||
cp ./.update.sh ./update.sh && chmod +x ./update.sh && exit $DFS_UPDATED_RET
|
||||
|
||||
57
.zshrc2
57
.zshrc2
@@ -14,17 +14,11 @@ export EDITOR='vim'
|
||||
export PYTHONIOENCODING='UTF-8'
|
||||
export GPG_TTY=$(tty)
|
||||
export LESS_TERMCAP_md=$'\E[01;33m'
|
||||
# env for dfs
|
||||
if [[ -f ~/.config/dotfiles/env ]]; then set -a; source ~/.config/dotfiles/env; set +a; fi
|
||||
|
||||
# antigen
|
||||
if [[ -z "$DFS_NO_WALL" ]]; then
|
||||
ANTIGEN_URL="https://gitee.com/dictxiong/antigen/raw/develop/bin/antigen.zsh"
|
||||
ANTIGEN_OMZ_REPO_URL="https://gitee.com/dictxiong/ohmyzsh.git"
|
||||
ANTIGEN_PLUGINS=(
|
||||
"https://gitee.com/dictxiong/zsh-syntax-highlighting"
|
||||
"https://gitee.com/dictxiong/zsh-completions"
|
||||
"https://gitee.com/dictxiong/zsh-autosuggestions"
|
||||
)
|
||||
else
|
||||
if [[ "$DFS_NO_WALL" == "1" ]]; then
|
||||
ANTIGEN_URL="https://raw.githubusercontent.com/zsh-users/antigen/develop/bin/antigen.zsh"
|
||||
ANTIGEN_OMZ_REPO_URL="https://github.com/ohmyzsh/ohmyzsh.git"
|
||||
ANTIGEN_PLUGINS=(
|
||||
@@ -32,6 +26,14 @@ else
|
||||
"https://github.com/zsh-users/zsh-completions"
|
||||
"https://github.com/zsh-users/zsh-autosuggestions"
|
||||
)
|
||||
else
|
||||
ANTIGEN_URL="https://gitee.com/dictxiong/antigen/raw/develop/bin/antigen.zsh"
|
||||
ANTIGEN_OMZ_REPO_URL="https://gitee.com/dictxiong/ohmyzsh.git"
|
||||
ANTIGEN_PLUGINS=(
|
||||
"https://gitee.com/dictxiong/zsh-syntax-highlighting"
|
||||
"https://gitee.com/dictxiong/zsh-completions"
|
||||
"https://gitee.com/dictxiong/zsh-autosuggestions"
|
||||
)
|
||||
fi
|
||||
ANTIGEN="$HOME/antigen.zsh"
|
||||
# Install antigen.zsh if not exist
|
||||
@@ -77,7 +79,7 @@ done
|
||||
# select theme
|
||||
TMP_THEME=ys
|
||||
if [[ -e /.dockerenv ]]; then
|
||||
TMP_THEME=blinks
|
||||
TMP_THEME=robbyrussell
|
||||
echo "==========================="
|
||||
echo "This is in docker container"
|
||||
echo "==========================="
|
||||
@@ -88,10 +90,12 @@ antigen apply
|
||||
# end of antigen config
|
||||
|
||||
# beacon
|
||||
if [[ -z "$DFS_INITED" && -z "$CI" ]]; then
|
||||
if [[ "$EUID" == "0" ]]; then
|
||||
"$DOTFILES/tools/common.sh" apost_beacon "sys.login.root"
|
||||
"$DOTFILES/tools/common.sh" apost_beacon "sys.login.root" "$(who am i | sed -E 's/ +/ /g' | awk '$1=$1')" 2>/dev/null
|
||||
else
|
||||
"$DOTFILES/tools/common.sh" apost_beacon "sys.login.user"
|
||||
"$DOTFILES/tools/common.sh" apost_beacon "sys.login.user" "$(who am i | sed -E 's/ +/ /g' | awk '$1=$1')" 2>/dev/null
|
||||
fi
|
||||
fi
|
||||
|
||||
# alias
|
||||
@@ -100,7 +104,9 @@ alias "se"='sudo -sE'
|
||||
alias "pbd"='ping baidu.com'
|
||||
alias "p114"='ping 114.114.114.114'
|
||||
alias "p666"='ping6 2001:da8::666'
|
||||
alias "gdebug"='git add -A; git commit -m "bug fix"'
|
||||
alias "cbd"='curl http://www.baidu.com'
|
||||
alias "cbds"='curl https://www.baidu.com'
|
||||
alias "gdebug"='git add -A; git commit --allow-empty -m "bug fix ($(date))"'
|
||||
case $(bash "$DOTFILES/tools/common.sh" get_os_type) in
|
||||
macos ) alias l='ls -lAGh -D "%y-%m-%d %H:%M"' ;;
|
||||
* ) alias l='ls -lAGh --time-style="+%y-%m-%d %H:%M"' ;;
|
||||
@@ -108,28 +114,8 @@ esac
|
||||
if [[ -x $(command -v trash) ]]; then
|
||||
alias "rm"="echo use the full path i.e. '/bin/rm'\; consider using trash"
|
||||
fi
|
||||
sibd() { ssh -p 12022 root@$1${1:+.}ibd.ink }
|
||||
sob() { ssh -p 24022 root@$1${1:+.}ob.ac.cn }
|
||||
snasp() { ssh -o ProxyJump="ssh@nasp.ob.ac.cn:36022" dictxiong@$1 }
|
||||
gbes() { git for-each-ref --sort=-committerdate refs/heads refs/remotes --format="%(authordate:format:%y-%m-%d.%a %H:%M %z)|%(color:red)%(objectname:short)|%(color:yellow)%(refname:short)%(color:reset)|%(color:reset)%(authorname): %(color:green)%(subject)" --color=always | column -ts"|" | less -FX }
|
||||
piv-agent()
|
||||
{
|
||||
eval $(ssh-agent -k)
|
||||
# they are: ubuntu, macos, respectively
|
||||
local SO_PATHS=( "/usr/lib64/opensc-pkcs11.so" "/usr/local/lib/opensc-pkcs11.so" )
|
||||
for i in ${SO_PATHS[*]}; do
|
||||
if [[ -f "$i" ]]; then
|
||||
echo "using: $i"
|
||||
eval $(ssh-agent -P "$i")
|
||||
ssh-add -s "$i"
|
||||
echo "now available keys:"
|
||||
ssh-add -l
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
echo "opensc-pkcs11.so not found"
|
||||
return 1
|
||||
}
|
||||
sagt() { eval "$($DOTFILES/tools/sagent.sh $@)" }
|
||||
|
||||
# key bindings
|
||||
bindkey "^b" beginning-of-line # ctrl+b
|
||||
@@ -183,10 +169,11 @@ dfs()
|
||||
echo 'Done. Please open a new shell to see the changes.'
|
||||
;;
|
||||
log ) "$DOTFILES/tools/common.sh" "post_log" "INFO" "dfs" "$2" ;;
|
||||
beacon ) "$DOTFILES/tools/common.sh" "post_beacon" "$2" ;;
|
||||
beacon ) "$DOTFILES/tools/common.sh" "post_beacon" "$2" "$3" ;;
|
||||
* ) echo "unknown command \"$1\". available: update, force-update, version, reset, cd, log" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# clean
|
||||
unset i
|
||||
export DFS_INITED=1
|
||||
|
||||
98
install.sh
98
install.sh
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
source "$THIS_DIR/tools/common.sh"
|
||||
|
||||
@@ -10,6 +10,7 @@ fi
|
||||
DOTFILE_TILDE=${DOTFILES/"$HOME"/\~}
|
||||
|
||||
CRON_JOB="0 * * * * ${DOTFILES}/update.sh"
|
||||
declare -a DFS_CONFIGS
|
||||
declare -a HOME_FILES_PATH
|
||||
declare -a HOME_FILES_CONTENT
|
||||
HOME_FILES_PATH[0]=".zshrc"
|
||||
@@ -28,22 +29,32 @@ HOME_SYMLINKS_DST[0]=".ssh/authorized_keys2"
|
||||
|
||||
install_dependencies()
|
||||
{
|
||||
local ret=0
|
||||
fmt_note "installing dependencies ..."
|
||||
set +e
|
||||
case $(get_os_name) in
|
||||
"ubuntu"|"debian" )
|
||||
$SUDO "$DOTFILES/tools/ubuntu.sh" apt-install
|
||||
$SUDOE "$DOTFILES/tools/ubuntu.sh" apt-install
|
||||
ret=$?
|
||||
;;
|
||||
"alpine" )
|
||||
$SUDO "$DOTFILES/tools/alpine.sh" apk-add
|
||||
$SUDOE "$DOTFILES/tools/alpine.sh" apk-add
|
||||
ret=$?
|
||||
;;
|
||||
"macos" )
|
||||
"$DOTFILES/tools/macos.sh" brew-install
|
||||
ret=$?
|
||||
;;
|
||||
"msys" )
|
||||
"$DOTFILES/tools/msys2.sh" pacman-S
|
||||
ret=$?
|
||||
;;
|
||||
* ) fmt_error "dfs auto-install is not implemented on OS: $(get_os_name)"
|
||||
* ) fmt_error "dfs auto-install is not implemented on OS: $(get_os_name). skipping ..."
|
||||
esac
|
||||
set -e
|
||||
if [[ "$ret" != "0" ]]; then
|
||||
fmt_error "failed to install dependencies."
|
||||
fi
|
||||
}
|
||||
|
||||
preinstall_check()
|
||||
@@ -61,8 +72,8 @@ preinstall_check()
|
||||
for i in "${optional_commands[@]}"; do
|
||||
if ! command -v $i 1>/dev/null; then
|
||||
fmt_warning "\"$i\" not found"
|
||||
ask_for_Yn "continue anyway?"
|
||||
if [[ "$?" == "0" ]]; then
|
||||
yn=$(ask_for_Yn "continue anyway?")
|
||||
if [[ "$yn" == "0" ]]; then
|
||||
fmt_info "all this utils are suggested: ${optional_commands[@]}"
|
||||
fmt_info "install them manually or check scripts in tools/"
|
||||
fmt_fatal "aborting ..."
|
||||
@@ -71,12 +82,45 @@ preinstall_check()
|
||||
done
|
||||
}
|
||||
|
||||
prepare_config()
|
||||
{
|
||||
local remote=$(cd "$DOTFILES" && git remote get-url origin)
|
||||
if [[ -z "$DFS_NO_WALL" && $remote == *github* ]]; then
|
||||
DFS_CONFIGS+=("DFS_NO_WALL=1")
|
||||
fi
|
||||
if [[ ${#DFS_CONFIGS[@]} == 0 ]]; then
|
||||
return
|
||||
fi
|
||||
fmt_note "preparing dotfiles configurations ..."
|
||||
local key value
|
||||
for i in "${DFS_CONFIGS[@]}"; do
|
||||
if [[ "$i" == *"="* ]]; then
|
||||
key=${i%%=*}
|
||||
value=${i#*=}
|
||||
else
|
||||
key=$i
|
||||
value=$(eval echo \$$key)
|
||||
fi
|
||||
HOME_FILES_PATH+=(".config/dotfiles/env")
|
||||
HOME_FILES_CONTENT+=("$key=$value")
|
||||
echo -n "$key=$value "
|
||||
export $key=$value
|
||||
done
|
||||
echo
|
||||
}
|
||||
|
||||
append_hist()
|
||||
{
|
||||
fmt_note "appending zsh history ..."
|
||||
"$DOTFILES/tools/append_zsh_hist.sh" "$@"
|
||||
}
|
||||
|
||||
install_file_content()
|
||||
{
|
||||
fmt_note "installing file content ..."
|
||||
for ((i=0; i<${#HOME_FILES_PATH[@]}; i++)); do
|
||||
local filename="$HOME/${HOME_FILES_PATH[$i]}"
|
||||
local content=${HOME_FILES_CONTENT[$i]}
|
||||
local content="${HOME_FILES_CONTENT[$i]}"
|
||||
fmt_info "installing \"$content\" into \"$filename\" ..."
|
||||
mkdir -p $(dirname "$filename")
|
||||
if [ ! -f "$filename" ]; then
|
||||
@@ -119,8 +163,8 @@ install_symlink()
|
||||
echo ----------
|
||||
stat $dst
|
||||
echo ----------
|
||||
ask_for_yN "would you like to replace ${dst}?"
|
||||
if [ $? -eq 1 ]; then
|
||||
yn=$(ask_for_yN "would you like to replace ${dst}?")
|
||||
if [[ "$yn" == "1" ]]; then
|
||||
rm $dst
|
||||
else
|
||||
fmt_error "aborting this job ..."
|
||||
@@ -211,7 +255,7 @@ install_update()
|
||||
RET=$?
|
||||
if [[ $RET == 85 ]]; then
|
||||
fmt_note "dfs updated. re-running install.sh ..."
|
||||
"${DOTFILES}/install.sh" "$ORIGIN_ARGS" && exit
|
||||
"${DOTFILES}/install.sh" "${ORIGIN_ARGS[@]}" && exit
|
||||
elif [[ $RET != 0 ]]; then
|
||||
fmt_fatal "update.sh failed with exit code $RET"
|
||||
fi
|
||||
@@ -227,6 +271,7 @@ uninstall_update()
|
||||
install()
|
||||
{
|
||||
if [[ "$INSTALL_DEP" == "1" ]]; then install_dependencies; fi
|
||||
prepare_config
|
||||
install_update
|
||||
preinstall_check
|
||||
install_crontab
|
||||
@@ -236,15 +281,15 @@ install()
|
||||
# those that won't be uninstalled in the future
|
||||
install_tmux_tpm
|
||||
install_vim_vundle
|
||||
if [[ -n "$DFS_HIST" ]]; then append_hist "$DFS_HIST"; fi
|
||||
fmt_note "done installing!"
|
||||
}
|
||||
|
||||
uninstall()
|
||||
{
|
||||
ask_for_yN "do you really want to uninstall?"
|
||||
if [[ $? != 1 ]]; then
|
||||
fmt_error "aborting this job ..."
|
||||
return
|
||||
yn=$(ask_for_yN "do you really want to uninstall?")
|
||||
if [[ "$yn" != "1" ]]; then
|
||||
fmt_fatal "aborting this job ..."
|
||||
fi
|
||||
uninstall_update
|
||||
uninstall_crontab
|
||||
@@ -254,19 +299,32 @@ uninstall()
|
||||
fmt_note "done uninstalling!"
|
||||
}
|
||||
|
||||
ORIGIN_ARGS="$@"
|
||||
parse_arg "$@"
|
||||
echo "this is the dotfiles installer, version $(cd "$DOTFILES" && git describe --tags --always --dirty)"
|
||||
echo "install options:" "${GOT_OPTS[@]}"
|
||||
FUNC=install
|
||||
INSTALL_DEP=0
|
||||
for i in ${PARSE_ARG_RET[@]}; do
|
||||
store_config=0
|
||||
store_hist=0
|
||||
for i in ${GOT_OPTS[@]}; do
|
||||
if [[ "$store_config" == "1" ]]; then
|
||||
store_config=0
|
||||
DFS_CONFIGS+=("$i")
|
||||
continue
|
||||
fi
|
||||
if [[ "$store_hist" == "1" ]]; then
|
||||
store_hist=0
|
||||
DFS_HIST=$i
|
||||
continue
|
||||
fi
|
||||
case $i in
|
||||
-i ) FUNC=install ;;
|
||||
-r ) FUNC=uninstall ;;
|
||||
-d|--dev ) export DFS_DEV=1 ;;
|
||||
-l|--lite ) export DFS_LITE=1 ;;
|
||||
-d|--dev ) export DFS_DEV=1; set -x ;;
|
||||
-a|--auto ) INSTALL_DEP=1 ;;
|
||||
-s|--secure ) export DFS_DEV=0 ;;
|
||||
* ) fmt_fatal "unknown option \"$i\". available: -i, -r, -q, -d, -l, -a, -s" ;;
|
||||
-H|--hist|--history ) store_hist=1 ;;
|
||||
-x ) store_config=1 ;;
|
||||
* ) fmt_fatal "unknown option \"$i\"" ;;
|
||||
esac
|
||||
done
|
||||
$FUNC
|
||||
|
||||
@@ -25,6 +25,6 @@ fi
|
||||
if [[ -z "$CONTAINER" ]]; then
|
||||
fmt_fatal "container not found"
|
||||
else
|
||||
echo "--> ${CONTAINER_META[@]}"
|
||||
fmt_note "--> ${CONTAINER_META[@]}"
|
||||
$SUDO docker exec -it $CONTAINER sh -c 'export DFS="bash <(curl dfs.beardic.cn) -a"; if [ -x "$(command -v zsh)" ]; then echo "--> zsh"; unset DFS; zsh; elif [ -x "$(command -v bash)" ]; then echo "--> bash"; bash; else echo "--> sh"; sh; fi'
|
||||
fi
|
||||
|
||||
@@ -20,6 +20,6 @@ fi
|
||||
if [[ -z "$IMAGE" ]]; then
|
||||
fmt_fatal "image not found"
|
||||
else
|
||||
echo "--> ${IMAGE_META[@]}"
|
||||
fmt_note "--> ${IMAGE_META[@]}"
|
||||
$SUDO docker run ${2:+"--name"} $2 -itd $IMAGE sh
|
||||
fi
|
||||
|
||||
44
scripts/pbin
Executable file
44
scripts/pbin
Executable file
@@ -0,0 +1,44 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
source "$THIS_DIR/../tools/common.sh"
|
||||
|
||||
get()
|
||||
{
|
||||
local key=$1
|
||||
if [[ -z "$key" ]]; then
|
||||
fmt_fatal "missing key"
|
||||
fi
|
||||
local output=${2:-/dev/stdout}
|
||||
local url="https://pastebin.com/raw/$key"
|
||||
curl -fsSL "$url" > "$output"
|
||||
}
|
||||
|
||||
put()
|
||||
{
|
||||
local input=${1:-/dev/stdin}
|
||||
(echo -n api_paste_code=; cat "$input") | curl -fsSL -X POST -d 'api_dev_key=SKZLfq9y_zW2hkgQOKZz1b5rw8hGiqxZ' -d 'api_option=paste' --data-binary @- "https://pastebin.com/api/api_post.php"
|
||||
}
|
||||
|
||||
route()
|
||||
{
|
||||
local cmd=$1
|
||||
if [[ -z "$cmd" ]]; then
|
||||
put
|
||||
exit
|
||||
else
|
||||
shift
|
||||
fi
|
||||
case $cmd in
|
||||
get )
|
||||
get "$@"
|
||||
;;
|
||||
put )
|
||||
put "$@"
|
||||
;;
|
||||
* )
|
||||
fmt_fatal "unknown command: $cmd"
|
||||
esac
|
||||
}
|
||||
|
||||
route "${GOT_OPTS[@]}"
|
||||
101
scripts/riot
Executable file
101
scripts/riot
Executable file
@@ -0,0 +1,101 @@
|
||||
#!/bin/bash
|
||||
# connect to iot services
|
||||
THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
source "$THIS_DIR/../tools/common.sh"
|
||||
|
||||
# get target settings
|
||||
# provides:
|
||||
SERVER=""
|
||||
PORT=""
|
||||
SSH_USERNAME=""
|
||||
SSH_OPTIONS=""
|
||||
get_server_meta()
|
||||
{
|
||||
local domain=${1##*.}
|
||||
local host=${1%.*}
|
||||
if [[ "$host" == "$domain" ]]; then
|
||||
domain=""
|
||||
fi
|
||||
case $domain in
|
||||
ibd|ebd )
|
||||
SERVER=$host.$domain.ink
|
||||
PORT=12022
|
||||
SSH_USERNAME=root
|
||||
;;
|
||||
nasp )
|
||||
SERVER=$host
|
||||
PORT=12022
|
||||
SSH_USERNAME=dictxiong
|
||||
SSH_OPTIONS='-o ProxyJump="ssh@nasp.ob.ac.cn:36022"'
|
||||
;;
|
||||
"" )
|
||||
SERVER=proxy.beardic.cn
|
||||
local tmp=$(sha256sum <<< "$host" | tr -cd "[:digit:]")
|
||||
tmp=${tmp:0:4}
|
||||
PORT=$((10#$tmp+36000))
|
||||
SSH_USERNAME=root
|
||||
;;
|
||||
* )
|
||||
fmt_fatal "unknown domain: $domain"
|
||||
esac
|
||||
}
|
||||
|
||||
# ssh
|
||||
run_ssh()
|
||||
{
|
||||
CMD="ssh -p $PORT $SSH_OPTIONS $SSH_USERNAME@$SERVER"
|
||||
fmt_note "-->" $CMD
|
||||
eval $CMD
|
||||
}
|
||||
|
||||
# sshl
|
||||
run_sshl()
|
||||
{
|
||||
if [[ -z "$1" || "$1" != *":"* ]]; then
|
||||
fmt_fatal "invalid remote address: $1"
|
||||
fi
|
||||
while
|
||||
local port=$(shuf -n 1 -i 49152-65535)
|
||||
netstat -atun | grep -q "$port"
|
||||
do
|
||||
continue
|
||||
done
|
||||
CMD="ssh -p $PORT $SSH_OPTIONS -NC -L $port:$1 $SSH_USERNAME@$SERVER"
|
||||
fmt_note "-->" $CMD
|
||||
fmt_note " > please access localhost:$port"
|
||||
eval $CMD
|
||||
}
|
||||
|
||||
# main
|
||||
print_help()
|
||||
{
|
||||
fmt_info "usage: $0 <service> [command] [options]"
|
||||
echo "available commands: ssh (default), sshl (ssh -L)"
|
||||
}
|
||||
|
||||
router()
|
||||
{
|
||||
if [[ -z "$1" || "$1" == "-h" || "$1" == "--help" ]]; then
|
||||
print_help
|
||||
exit
|
||||
fi
|
||||
get_server_meta "$1"
|
||||
case $2 in
|
||||
-h|--help)
|
||||
print_help
|
||||
exit
|
||||
;;
|
||||
ssh|"" )
|
||||
run_ssh
|
||||
;;
|
||||
sshl )
|
||||
run_sshl "$3"
|
||||
;;
|
||||
* )
|
||||
print_help
|
||||
fmt_fatal "unknown command: $2"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
router "${GOT_OPTS[@]}"
|
||||
@@ -15,7 +15,7 @@ apk_add()
|
||||
# lite
|
||||
apk add zsh bash git tmux vim curl fzf iputils coreutils util-linux
|
||||
# full
|
||||
if [[ -z "$DFS_LITE" ]]; then
|
||||
if [[ -z "$DFS_LITE" || "$DFS_LITE" == "0" ]]; then
|
||||
apk add wget python3 py3-pip htop gcc g++ cmake make perl linux-headers bind-tools man-db
|
||||
fi
|
||||
}
|
||||
@@ -34,8 +34,8 @@ router()
|
||||
apk-add ) apk_add ;;
|
||||
set-timezone | set-tz ) set_timezone ;;
|
||||
set-mirror ) set_mirror $2 ;;
|
||||
* ) echo unknown command "$1". available: apk-add, set-timezone;;
|
||||
* ) echo unknown command \"$1\". available: apk-add, set-timezone;;
|
||||
esac
|
||||
}
|
||||
|
||||
router $@
|
||||
router "${GOT_OPTS[@]}"
|
||||
|
||||
33
tools/append_zsh_hist.sh
Executable file
33
tools/append_zsh_hist.sh
Executable file
@@ -0,0 +1,33 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
source "$THIS_DIR/common.sh"
|
||||
|
||||
zsh_hist_file="$HOME/.zsh_history"
|
||||
|
||||
do_append()
|
||||
{
|
||||
timestamp=$(date +%s)
|
||||
while read -r line; do
|
||||
if [[ -n "$line" ]]; then
|
||||
echo ": $timestamp:0;$line" >> "$zsh_hist_file"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
main()
|
||||
{
|
||||
key=$1
|
||||
if [[ -z "$key" ]]; then
|
||||
fmt_fatal "missing key"
|
||||
fi
|
||||
IFS=',' read -r -a keys<<<"$key"
|
||||
for k in "${keys[@]}";do
|
||||
if [[ -z "$k" ]]; then
|
||||
continue
|
||||
fi
|
||||
(curl -fsSL "https://pastebin.com/raw/$k" && echo) | sed 's/\r//' | do_append
|
||||
done
|
||||
}
|
||||
|
||||
main "${GOT_OPTS[@]}"
|
||||
@@ -3,10 +3,41 @@ set -e
|
||||
THIS_DIR_COMMON_SH=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
export DOTFILES=$( cd "$THIS_DIR_COMMON_SH/.." && pwd )
|
||||
if [[ -f ~/.config/dotfiles/env ]]; then set -a; source ~/.config/dotfiles/env; set +a; fi
|
||||
if [[ "$DFS_DEBUG" == "1" ]]; then set -x; fi
|
||||
DFS_CURL_OPTIONS="--retry 2 --max-time 20"
|
||||
|
||||
# parse args and set env, when it is sourced
|
||||
# todo: make this skipable
|
||||
if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
|
||||
ORIGIN_ARGS=("$@")
|
||||
ARG=""
|
||||
GOT_OPTS=()
|
||||
while [[ $# > 0 || -n "$ARG" ]]; do
|
||||
if [[ -z "$ARG" ]]; then ARG=$1; shift; fi
|
||||
case $ARG in
|
||||
-q*|--quite ) export DFS_QUIET=1 ;;
|
||||
-l*|--lite ) export DFS_LITE=1 ;;
|
||||
--color ) export DFS_COLOR=1 ;;
|
||||
--dry-run ) export DFS_DRY_RUN=1 ;; # TODO!!!
|
||||
--*=* ) GOT_OPTS+=("${ARG%%=*}" "${ARG#*=}") ;;
|
||||
--* ) GOT_OPTS+=("$ARG") ;;
|
||||
-* ) GOT_OPTS+=("${ARG:0:2}") ;;
|
||||
* ) GOT_OPTS+=("$ARG") ;;
|
||||
esac
|
||||
if [[ "$ARG" == "--"* || ! "$ARG" == "-"* || ${#ARG} -le 2 ]]; then
|
||||
ARG=""
|
||||
else
|
||||
ARG=-${ARG:2}
|
||||
fi
|
||||
done
|
||||
set -- "${ORIGIN_ARGS[@]}"
|
||||
unset ARG
|
||||
# outputs: GOT_OPTS and ORIGIN_ARGS
|
||||
fi
|
||||
|
||||
# Color settings
|
||||
# Source: https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
|
||||
if [ -t 1 ]; then
|
||||
if [[ -t 1 || "$DFS_COLOR" == "1" ]]; then
|
||||
is_tty() {
|
||||
true
|
||||
}
|
||||
@@ -46,11 +77,11 @@ fmt_warning() {
|
||||
}
|
||||
|
||||
fmt_info() {
|
||||
printf '%sinfo: %s\n' "${FMT_RESET}" "$*" >&1
|
||||
printf '%sinfo: %s\n' "${FMT_RESET}" "$*" >&2
|
||||
}
|
||||
|
||||
fmt_note() {
|
||||
printf '%s%s%s\n' "${FMT_GREEN}" "$*" "${FMT_RESET}" >&1
|
||||
printf '%s%s%s\n' "${FMT_GREEN}" "$*" "${FMT_RESET}" >&2
|
||||
}
|
||||
|
||||
setup_color() {
|
||||
@@ -98,52 +129,36 @@ setup_color() {
|
||||
# END of color settings
|
||||
|
||||
SUDO=''
|
||||
SUDOE=''
|
||||
if [[ "$EUID" != "0" && -x $(command -v sudo) ]]; then
|
||||
SUDO='sudo'
|
||||
SUDOE='sudo -E'
|
||||
fi
|
||||
|
||||
parse_arg()
|
||||
{
|
||||
local ARG=""
|
||||
PARSE_ARG_RET=()
|
||||
while [[ $# > 0 || -n "$ARG" ]]; do
|
||||
if [[ -z "$ARG" ]]; then ARG=$1; shift; fi
|
||||
case $ARG in
|
||||
-q*|--quite ) export DFS_QUIET=1 ;;
|
||||
--* ) PARSE_ARG_RET+=("$ARG") ;;
|
||||
-* ) PARSE_ARG_RET+=("${ARG:0:2}") ;;
|
||||
* ) PARSE_ARG_RET+=("$ARG") ;;
|
||||
esac
|
||||
if [[ "$ARG" == "--"* || ! "$ARG" == "-"* || ${#ARG} -le 2 ]]; then
|
||||
ARG=""
|
||||
else
|
||||
ARG=-${ARG:2}
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
ask_for_yN()
|
||||
{
|
||||
while [[ -z "$DFS_QUIET" || "$DFS_QUIET" == "0" ]]; do
|
||||
if [[ "$DFS_QUIET" == "1" ]]; then
|
||||
echo 0
|
||||
else
|
||||
read -p "${FMT_YELLOW}$1${FMT_RESET} [yN]: " yn
|
||||
case $yn in
|
||||
[Yy]* ) return 1;;
|
||||
* ) return 0;;
|
||||
[Yy]* ) echo 1;;
|
||||
* ) echo 0;;
|
||||
esac
|
||||
done
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
ask_for_Yn()
|
||||
{
|
||||
while [[ -z "$DFS_QUIET" || "$DFS_QUIET" == "0" ]]; do
|
||||
if [[ "$DFS_QUIET" == "1" ]]; then
|
||||
echo 1
|
||||
else
|
||||
read -p "${FMT_YELLOW}$1${FMT_RESET} [Yn]: " yn
|
||||
case $yn in
|
||||
[Nn]* ) return 0;;
|
||||
* ) return 1;;
|
||||
[Nn]* ) echo 0;;
|
||||
* ) echo 1;;
|
||||
esac
|
||||
done
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
post_log()
|
||||
@@ -151,7 +166,7 @@ post_log()
|
||||
if [[ $# != 3 || -z "$1" || -z "$2" || -z "$3" ]]; then
|
||||
fmt_fatal "usage: post_log <level> <section> <content>"
|
||||
fi
|
||||
"${DOTFILES}/tools/logger.sh" "log" "[$1][$2] $3"
|
||||
"${DOTFILES}/tools/frigg-client.sh" "log" "[$1][$2] $3"
|
||||
}
|
||||
|
||||
apost_log()
|
||||
@@ -161,10 +176,10 @@ apost_log()
|
||||
|
||||
post_beacon()
|
||||
{
|
||||
if [[ $# != 1 || -z "$1" ]]; then
|
||||
if [[ $# < 1 || -z "$1" ]]; then
|
||||
fmt_fatal "usage: post_beacon <beacon>"
|
||||
fi
|
||||
"${DOTFILES}/tools/logger.sh" "beacon" "$1"
|
||||
"${DOTFILES}/tools/frigg-client.sh" "beacon" "$1" "$2"
|
||||
}
|
||||
|
||||
apost_beacon()
|
||||
|
||||
165
tools/frigg-client.sh
Executable file
165
tools/frigg-client.sh
Executable file
@@ -0,0 +1,165 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
source "$THIS_DIR/common.sh"
|
||||
|
||||
if [[ "$DFS_ORPHAN" == "1" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ -n "$DFS_HOSTNAME" ]]; then
|
||||
hostname=$DFS_HOSTNAME
|
||||
elif [[ -x $(command -v hostname) ]]; then
|
||||
hostname=$(hostname)
|
||||
elif [[ -x $(command -v uname) ]]; then
|
||||
hostname=$(uname -n)
|
||||
elif [[ -x $(command -v hostnamectl) ]]; then
|
||||
hostname=$(hostnamectl --static)
|
||||
elif [[ -n "$HOSTNAME" ]]; then
|
||||
hostname=$HOSTNAME
|
||||
elif [[ -f /proc/sys/kernel/hostname ]]; then
|
||||
hostname=$(cat /proc/sys/kernel/hostname)
|
||||
elif [[ -f /etc/hostname ]]; then
|
||||
hostname=$(cat /etc/hostname)
|
||||
else
|
||||
fmt_fatal "unable to get hostname"
|
||||
fi
|
||||
|
||||
init_uuid()
|
||||
{
|
||||
if [[ -f ~/.config/dotfiles/uuid ]]; then
|
||||
uuid=$(cat ~/.config/dotfiles/uuid)
|
||||
else
|
||||
if [[ -x $(command -v uuidgen) ]]; then
|
||||
uuid=$(uuidgen)
|
||||
elif [[ -f /proc/sys/kernel/random/uuid ]]; then
|
||||
uuid=$(cat /proc/sys/kernel/random/uuid)
|
||||
else
|
||||
fmt_fatal "unable to generate uuid"
|
||||
fi
|
||||
mkdir -p ~/.config/dotfiles
|
||||
echo "$uuid" > ~/.config/dotfiles/uuid
|
||||
fi
|
||||
}
|
||||
|
||||
handle_resp()
|
||||
{
|
||||
local resp="$1"
|
||||
if grep -q "200" <<< "$resp"; then
|
||||
echo $resp
|
||||
elif grep -q "403" <<< "$resp"; then
|
||||
echo $resp >&2
|
||||
fmt_error "error accessing api: authentification failed"
|
||||
fmt_info "try to register you hostname and uuid"
|
||||
fmt_info "hostname: $hostname"
|
||||
fmt_info "uuid: $uuid"
|
||||
else
|
||||
echo $resp >&2
|
||||
fmt_fatal "server returned an error"
|
||||
# here return 1 because this is not expected
|
||||
fi
|
||||
}
|
||||
|
||||
post_beacon()
|
||||
{
|
||||
local beacon_type=$1
|
||||
local meta=$2
|
||||
if [[ -n "$CI" && "$beacon_type" != "gh.ci" && "$beacon_type" != "dfs.invalid-commit" && "$beacon_type" != "dfs.dirty" ]]; then
|
||||
return
|
||||
fi
|
||||
if [[ -z "$beacon_type" ]]; then
|
||||
fmt_fatal "beacon type is required"
|
||||
fi
|
||||
resp=$(curl $DFS_CURL_OPTIONS -sSL -X POST -H "Content-Type: text/plain" -d "$meta" "https://api.beardic.cn/post-beacon?hostname=$hostname&beacon=$beacon_type")
|
||||
handle_resp "$resp"
|
||||
}
|
||||
|
||||
post_log()
|
||||
{
|
||||
local log_content=$1
|
||||
if [[ -z "$log_content" ]]; then
|
||||
fmt_fatal "log content is required"
|
||||
fi
|
||||
init_uuid
|
||||
resp=$(curl $DFS_CURL_OPTIONS -sSL -X POST -H "Content-Type: text/plain" -d "$log_content" "https://api.beardic.cn/post-log?hostname=$hostname&uuid=$uuid")
|
||||
handle_resp "$resp"
|
||||
}
|
||||
|
||||
update_dns()
|
||||
{
|
||||
if [[ -z "$DFS_DDNS_IP4$DFS_DDNS_IP6" ]]; then
|
||||
fmt_fatal "neither DFS_DDNS_IP4 nor DFS_DDNS_IP6 is configured"
|
||||
fi
|
||||
if [[ "$DFS_DDNS_IP4$DFS_DDNS_IP6" == "autoauto" ]]; then
|
||||
fmt_fatal "DFS_DDNS_IP4 and DFS_DDNS_IP6 cannot both be auto"
|
||||
fi
|
||||
init_uuid
|
||||
local ip4
|
||||
local ip6
|
||||
local api_url="https://api.beardic.cn"
|
||||
# get ip4
|
||||
if [[ -z "$DFS_DDNS_IP4" ]]; then
|
||||
ip4=""
|
||||
elif [[ "$DFS_DDNS_IP4" == "auto" ]]; then
|
||||
ip4="auto"
|
||||
elif [[ "$DFS_DDNS_IP4" == "api" ]]; then
|
||||
ip4=$(curl $DFS_CURL_OPTIONS -sSL "https://api.ipify.org")
|
||||
elif [[ "$DFS_DDNS_IP4" == "http"* ]]; then
|
||||
ip4=$(curl $DFS_CURL_OPTIONS -sSL "$DFS_DDNS_IP4")
|
||||
else
|
||||
ip4=$(ip a show $DFS_DDNS_IP4 | grep inet | grep global | awk '/inet / {print $2}' | awk -F'[/]' '{print $1}')
|
||||
fi
|
||||
if [[ -n "$DFS_DDNS_IP4" && -z "$ip4" ]]; then
|
||||
fmt_fatal "failed getting ip4 address"
|
||||
fi
|
||||
# get ip6
|
||||
if [[ -z "$DFS_DDNS_IP6" ]]; then
|
||||
ip6=""
|
||||
elif [[ "$DFS_DDNS_IP6" == "auto" ]]; then
|
||||
ip6="auto"
|
||||
api_url="https://api6.beardic.cn"
|
||||
elif [[ "$DFS_DDNS_IP6" == "api" ]]; then
|
||||
ip6=$(curl $DFS_CURL_OPTIONS -sSL "https://api6.ipify.org")
|
||||
elif [[ "$DFS_DDNS_IP6" == "http"* ]]; then
|
||||
ip6=$(curl $DFS_CURL_OPTIONS -sSL "$DFS_DDNS_IP6")
|
||||
else
|
||||
ip6=$(ip a show $DFS_DDNS_IP6 | grep inet6 | grep global | awk '/inet6 / {print $2}' | awk -F'[/]' '{print $1}')
|
||||
fi
|
||||
if [[ -n "$DFS_DDNS_IP6" && -z "$ip6" ]]; then
|
||||
fmt_fatal "failed getting ip6 address"
|
||||
fi
|
||||
# update dns
|
||||
fmt_note "updating dns record for $hostname with ip4=$ip4 ip6=$ip6"
|
||||
resp=$(curl $DFS_CURL_OPTIONS -sSL "$api_url/update-dns?hostname=$hostname&uuid=$uuid&ip4=$ip4&ip6=$ip6")
|
||||
handle_resp "$resp"
|
||||
}
|
||||
|
||||
print_help()
|
||||
{
|
||||
fmt_info "usage: $0 <beacon|log|ddns> [beacon_type|log_content]"
|
||||
}
|
||||
|
||||
router()
|
||||
{
|
||||
case "$1" in
|
||||
-h|--help)
|
||||
print_help
|
||||
;;
|
||||
beacon)
|
||||
post_beacon "$2" "$3"
|
||||
;;
|
||||
log)
|
||||
post_log "$2"
|
||||
;;
|
||||
ddns)
|
||||
update_dns
|
||||
;;
|
||||
*)
|
||||
print_help
|
||||
fmt_fatal "invalid argument"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
router "${GOT_OPTS[@]}"
|
||||
63
tools/get.dotfiles.cn
Normal file
63
tools/get.dotfiles.cn
Normal file
@@ -0,0 +1,63 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
ARG=""
|
||||
GOT_OPTS=()
|
||||
DFS_USER="$(whoami)"
|
||||
while [[ $# > 0||-n "$ARG" ]];do
|
||||
if [[ -z "$ARG" ]];then ARG=$1;shift;fi
|
||||
case $ARG in
|
||||
-s*|--secure)DFS_SECURE=1;;
|
||||
-u*|--user)if [[ "$ARG" == --*=* ]];then
|
||||
DFS_USER="${ARG#*=}"
|
||||
else
|
||||
DFS_USER=$1
|
||||
shift
|
||||
fi
|
||||
if [[ -z "$DFS_USER" ]];then
|
||||
echo "install user is required"
|
||||
exit 1
|
||||
fi;;
|
||||
--*=*)GOT_OPTS+=("${ARG%%=*}" "${ARG#*=}");;
|
||||
--*)GOT_OPTS+=("$ARG");;
|
||||
-*)GOT_OPTS+=("${ARG:0:2}");;
|
||||
*)GOT_OPTS+=("$ARG");;
|
||||
esac
|
||||
if [[ "$ARG" == "--"*||! "$ARG" == "-"*||${#ARG} -le 2 ]];then
|
||||
ARG=""
|
||||
else
|
||||
ARG=-${ARG:2}
|
||||
fi
|
||||
done
|
||||
IFS=',' read -r -a DFS_USERS<<<"$DFS_USER"
|
||||
for u in "${DFS_USERS[@]}";do
|
||||
if [[ -z "$u" ]];then
|
||||
continue
|
||||
fi
|
||||
if ! id -u "$u" >/dev/null 2>&1;then
|
||||
echo "user $u not exists"
|
||||
exit 1
|
||||
fi
|
||||
if [[ "$u" == "$(whoami)" ]];then
|
||||
SUCMD="bash"
|
||||
else
|
||||
SUCMD="su $u"
|
||||
fi
|
||||
echo "install for user $u in 3 seconds ..."
|
||||
sleep 3
|
||||
$SUCMD<<EOF
|
||||
set -e
|
||||
cd
|
||||
if [[ ! -f ~/dotfiles/install.sh ]];then
|
||||
git clone ${repo}
|
||||
fi
|
||||
if [[ "$DFS_SECURE" == "1" ]];then
|
||||
echo "enter secure mode"
|
||||
cd dotfiles
|
||||
git fetch --all
|
||||
git -c advice.detachedHead=false checkout $(curl -fsSL https://api.beardic.cn/get-var/dfs-commit-id)
|
||||
cd
|
||||
fi
|
||||
./dotfiles/install.sh ${GOT_OPTS[@]}
|
||||
zsh -c "source ~/.zshrc"
|
||||
EOF
|
||||
done
|
||||
100
tools/logger.sh
100
tools/logger.sh
@@ -1,100 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
source "$THIS_DIR/common.sh"
|
||||
|
||||
if [[ -x $(command -v hostname) ]]; then
|
||||
hostname=$(hostname)
|
||||
elif [[ -x $(command -v uname) ]]; then
|
||||
hostname=$(uname -n)
|
||||
elif [[ -x $(command -v hostnamectl) ]]; then
|
||||
hostname=$(hostnamectl --static)
|
||||
elif [[ -n "$HOSTNAME" ]]; then
|
||||
hostname=$HOSTNAME
|
||||
elif [[ -f /proc/sys/kernel/hostname ]]; then
|
||||
hostname=$(cat /proc/sys/kernel/hostname)
|
||||
elif [[ -f /etc/hostname ]]; then
|
||||
hostname=$(cat /etc/hostname)
|
||||
else
|
||||
fmt_fatal "unable to get hostname"
|
||||
fi
|
||||
|
||||
init_uuid()
|
||||
{
|
||||
if [[ -f ~/.config/dotfiles/uuid ]]; then
|
||||
uuid=$(cat ~/.config/dotfiles/uuid)
|
||||
else
|
||||
if [[ -x $(command -v uuidgen) ]]; then
|
||||
uuid=$(uuidgen)
|
||||
elif [[ -f /proc/sys/kernel/random/uuid ]]; then
|
||||
uuid=$(cat /proc/sys/kernel/random/uuid)
|
||||
else
|
||||
fmt_fatal "unable to generate uuid"
|
||||
fi
|
||||
mkdir -p ~/.config/dotfiles
|
||||
echo "$uuid" > ~/.config/dotfiles/uuid
|
||||
fi
|
||||
}
|
||||
|
||||
post_beacon()
|
||||
{
|
||||
local beacon_type=$1
|
||||
if [[ -z "$beacon_type" ]]; then
|
||||
fmt_fatal "beacon type is required"
|
||||
fi
|
||||
resp=$(curl -sSL -X POST "https://api.beardic.cn/post-beacon?hostname=$hostname&beacon=$beacon_type")
|
||||
if grep -q "200" <<< "$resp"; then
|
||||
echo $resp
|
||||
else
|
||||
echo $resp >&2
|
||||
fmt_fatal "error posting beacon"
|
||||
fi
|
||||
}
|
||||
|
||||
post_log()
|
||||
{
|
||||
local log_content=$1
|
||||
if [[ -z "$log_content" ]]; then
|
||||
fmt_fatal "log content is required"
|
||||
fi
|
||||
init_uuid
|
||||
resp=$(curl -sSL -X POST -H "Content-Type: text/plain" -d "$1" "https://api.beardic.cn/post-log?hostname=$hostname&uuid=$uuid")
|
||||
if grep -q "200" <<< "$resp"; then
|
||||
echo $resp
|
||||
elif grep -q "403" <<< "$resp"; then
|
||||
echo $resp >&2
|
||||
fmt_error "error posting log: authentification failed"
|
||||
fmt_info "try to register you hostname and uuid"
|
||||
fmt_info "hostname: $hostname"
|
||||
fmt_info "uuid: $uuid"
|
||||
else
|
||||
echo $resp >&2
|
||||
fmt_fatal "error posting log"
|
||||
fi
|
||||
}
|
||||
|
||||
print_help()
|
||||
{
|
||||
fmt_info "usage: $0 <beacon|log> <beacon_type|log_content>"
|
||||
}
|
||||
|
||||
if [[ $# != 2 ]]; then
|
||||
print_help >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "$1" in
|
||||
-h|--help)
|
||||
fmt_info "usage: $0 <beacon|log> <beacon_type|log_content>"
|
||||
;;
|
||||
beacon)
|
||||
post_beacon "$2"
|
||||
;;
|
||||
log)
|
||||
post_log "$2"
|
||||
;;
|
||||
*)
|
||||
fmt_fatal "invalid argument"
|
||||
;;
|
||||
esac
|
||||
@@ -5,7 +5,7 @@ source "$THIS_DIR/common.sh"
|
||||
|
||||
brew_install()
|
||||
{
|
||||
brew update
|
||||
# brew update
|
||||
brew install git zsh curl tmux vim util-linux
|
||||
}
|
||||
|
||||
@@ -13,8 +13,8 @@ router()
|
||||
{
|
||||
case $1 in
|
||||
brew-install ) brew_install ;;
|
||||
* ) echo unknown command "$1". available: brew-install;;
|
||||
* ) echo unknown command \"$1\". available: brew-install;;
|
||||
esac
|
||||
}
|
||||
|
||||
router $@
|
||||
router "${GOT_OPTS[@]}"
|
||||
|
||||
@@ -17,7 +17,7 @@ pacman_S()
|
||||
# lite
|
||||
pacman -S tmux git zsh bash curl vim
|
||||
# full
|
||||
if [[ -z "$DFS_LITE" ]]; then
|
||||
if [[ -z "$DFS_LITE" || "$DFS_LITE" == "0" ]]; then
|
||||
pacman -S wget base-devel mingw-w64-x86_64-toolchain make cmake gcc zip unzip python3 python3-pip man-pages-posix
|
||||
fi
|
||||
}
|
||||
@@ -27,8 +27,8 @@ router()
|
||||
case $1 in
|
||||
pacman-S ) pacman_S ;;
|
||||
set-mirror ) set_mirror $2 ;;
|
||||
* ) echo unknown command "$1". available: pacman-S, set-mirror ;;
|
||||
* ) echo unknown command \"$1\". available: pacman-S, set-mirror ;;
|
||||
esac
|
||||
}
|
||||
|
||||
router $@
|
||||
router "${GOT_OPTS[@]}"
|
||||
|
||||
105
tools/sagent.sh
Executable file
105
tools/sagent.sh
Executable file
@@ -0,0 +1,105 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
export DFS_COLOR=1
|
||||
source "$THIS_DIR/common.sh"
|
||||
|
||||
|
||||
find_so_file()
|
||||
{
|
||||
local SO_PATHS=( "/usr/lib64/opensc-pkcs11.so" "/usr/local/lib/opensc-pkcs11.so" )
|
||||
local SO_FILE
|
||||
for SO_FILE in ${SO_PATHS[*]}; do
|
||||
if [[ -f "$SO_FILE" ]]; then
|
||||
echo "$SO_FILE"
|
||||
return
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
create_agent()
|
||||
{
|
||||
local SO_FILE=$(find_so_file)
|
||||
if [[ -n "$SO_FILE" ]]; then
|
||||
fmt_note "opensc-pkcs11.so found"
|
||||
SO_FILE="-P $SO_FILE"
|
||||
fi
|
||||
ssh-agent $SO_FILE
|
||||
}
|
||||
|
||||
kill_agent()
|
||||
{
|
||||
if pgrep -x ssh-agent > /dev/null; then
|
||||
fmt_note "killing existing agent"
|
||||
pkill -9 -x ssh-agent
|
||||
fi
|
||||
}
|
||||
|
||||
add_piv()
|
||||
{
|
||||
local SO_FILE=$(find_so_file)
|
||||
if [[ -n "$SO_FILE" ]]; then
|
||||
echo ssh-add -s \"$SO_FILE\"
|
||||
else
|
||||
fmt_error "opensc-pkcs11.so not found"
|
||||
fi
|
||||
list
|
||||
}
|
||||
|
||||
list()
|
||||
{
|
||||
echo echo "available keys:"
|
||||
echo ssh-add -l
|
||||
}
|
||||
|
||||
reset()
|
||||
{
|
||||
kill_agent
|
||||
all
|
||||
}
|
||||
|
||||
all()
|
||||
{
|
||||
local agent_file="/tmp/piv-agent-$(whoami)"
|
||||
if [[ -f $agent_file ]]; then
|
||||
source $agent_file > /dev/null
|
||||
else
|
||||
touch $agent_file
|
||||
chmod 600 $agent_file
|
||||
fi
|
||||
if ! ps -p "$SSH_AGENT_PID" 1>/dev/null 2>&1; then
|
||||
kill_agent
|
||||
fmt_note "launching a new agent"
|
||||
create_agent | tee $agent_file
|
||||
else
|
||||
fmt_note "using existing agent: $SSH_AGENT_PID"
|
||||
cat $agent_file
|
||||
fi
|
||||
}
|
||||
|
||||
route()
|
||||
{
|
||||
if [[ $# -eq 0 ]]; then
|
||||
all
|
||||
return
|
||||
fi
|
||||
case $1 in
|
||||
kill)
|
||||
kill_agent
|
||||
;;
|
||||
piv)
|
||||
add_piv
|
||||
;;
|
||||
reset)
|
||||
reset
|
||||
;;
|
||||
list|ls)
|
||||
list
|
||||
;;
|
||||
*)
|
||||
fmt_error "unknown command: $1"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
route "$@"
|
||||
21
tools/test-getopts.sh
Executable file
21
tools/test-getopts.sh
Executable file
@@ -0,0 +1,21 @@
|
||||
#!/bin/bash
|
||||
set -ex
|
||||
OPTS='-a -bcl --color --arg1=1 --arg2 2 " 1 2" yes'
|
||||
TARGET_OPTS='-a -b -c --arg1 1 --arg2 2 1 2 yes'
|
||||
eval set -- $OPTS
|
||||
|
||||
THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
|
||||
source "$THIS_DIR/common.sh"
|
||||
|
||||
test "${GOT_OPTS[*]}" = "$TARGET_OPTS"
|
||||
test $# -eq 8
|
||||
test "$*" = "${OPTS//\"/}"
|
||||
test "$DFS_LITE" = "1"
|
||||
is_tty
|
||||
test -z "$DFS_QUIET"
|
||||
|
||||
set +x
|
||||
echo "test passed, args:"
|
||||
for i in "${GOT_OPTS[@]}"; do
|
||||
echo "$i"
|
||||
done
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/bin/false "This script should be sourced in zsh, not executed directly"
|
||||
|
||||
set -ex
|
||||
trap "dfs beacon gh.ci.fail" ERR
|
||||
|
||||
# check files
|
||||
cd /
|
||||
@@ -17,19 +18,26 @@ grep -q ".zshrc2" ~/.zshrc
|
||||
# check scripts and functions
|
||||
dfs version
|
||||
dfs log 1
|
||||
dfs beacon gh.ci
|
||||
dfs beacon gh.ci $GITHUB_SHA
|
||||
z ~
|
||||
test ~ -ef "$(pwd)"
|
||||
dogo
|
||||
doll
|
||||
dfs cd
|
||||
tools/common.sh get_os_type
|
||||
tools/common.sh get_linux_dist
|
||||
tools/test-getopts.sh
|
||||
tools/common.sh get_os_name
|
||||
test $(echo y | tools/common.sh ask_for_yN "test") = "1"
|
||||
test $(echo n | tools/common.sh ask_for_yN "test") = "0"
|
||||
test $(echo | tools/common.sh ask_for_yN "test") = "0"
|
||||
test $(echo | tools/common.sh ask_for_Yn "test") = "1"
|
||||
test $(DFS_QUIET=1 tools/common.sh ask_for_Yn "test") = "1"
|
||||
|
||||
# check alias
|
||||
alias p114
|
||||
which sibd
|
||||
piv-agent || which piv-agent
|
||||
alias cbds
|
||||
which riot
|
||||
sagt
|
||||
test -f "/tmp/piv-agent-$(whoami)"
|
||||
gbes || which gbes
|
||||
|
||||
# check update
|
||||
@@ -42,6 +50,10 @@ test `git rev-parse HEAD` = `curl -fsSL https://api.beardic.cn/get-var/dfs-commi
|
||||
git reset --hard $DFS_VERSION
|
||||
|
||||
# then check install.sh
|
||||
./install.sh -dx DFS_CI=1 -H e153a2eL,f8At3iFw
|
||||
grep -qE "testhist 1$" ~/.zsh_history
|
||||
grep -qE "testhist 4$" ~/.zsh_history
|
||||
grep -qx "DFS_CI=1" ~/.config/dotfiles/env
|
||||
./install.sh -l
|
||||
dfs version
|
||||
test `git rev-parse HEAD` = `curl -fsSL https://api.beardic.cn/get-var/dfs-commit-id`
|
||||
|
||||
@@ -9,7 +9,7 @@ INSTALL_COMMANDS=(\
|
||||
[oh-my-tuna]='wget https://tuna.moe/oh-my-tuna/oh-my-tuna.py && sudo python oh-my-tuna.py --global' \
|
||||
[v2fly]="bash <(curl -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh) #--remove" \
|
||||
[zerotier-one]='curl -s https://install.zerotier.com | sudo bash' \
|
||||
[docker-ce]='curl -fsSL https://get.docker.com -o get-docker.sh && sudo sh get-docker.sh #--mirror Aliyun #--dry-run' \
|
||||
[docker-ce]='curl -fsSL https://get.docker.com | sudo bash -s - --mirror Aliyun #--dry-run' \
|
||||
[lemonbench]='curl -fsSL https://ilemonra.in/LemonBenchIntl | bash -s fast # or full' \
|
||||
)
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@ apt_install()
|
||||
# lite
|
||||
apt-get install -y git zsh bash tmux vim curl inetutils-ping less bsdmainutils
|
||||
# full
|
||||
if [[ -z "$DFS_LITE" ]]; then
|
||||
apt-get install wget dialog net-tools dnsutils netcat traceroute sudo python3 python3-pip cron openssh-client openssh-server htop gcc g++ cmake make zip
|
||||
if [[ -z "$DFS_LITE" || "$DFS_LITE" == "0" ]]; then
|
||||
apt-get install -y wget dialog net-tools dnsutils netcat traceroute sudo python3 python3-pip cron openssh-client openssh-server htop gcc g++ cmake make zip
|
||||
for i in {fzf,ripgrep,man-db}; do apt-get install -y $i; done
|
||||
fi
|
||||
}
|
||||
@@ -35,8 +35,8 @@ router()
|
||||
set-mirror ) set_mirror $2 ;;
|
||||
set-timezone\
|
||||
| set-tz ) set_timezone $2 ;;
|
||||
* ) echo unknown command "$1". available: apt-install, set-mirror, set-timezone;;
|
||||
* ) echo unknown command \"$1\". available: apt-install, set-mirror, set-timezone;;
|
||||
esac
|
||||
}
|
||||
|
||||
router $@
|
||||
router "${GOT_OPTS[@]}"
|
||||
|
||||
Reference in New Issue
Block a user