diff --git a/rua-scripts/docker.sh b/rua-scripts/docker.sh index e56a649..4abbc50 100644 --- a/rua-scripts/docker.sh +++ b/rua-scripts/docker.sh @@ -5,9 +5,9 @@ # alias docker_up="docker build -t ${IMAGE_NAME} --progress=plain . && docker tag $IMAGE_NAME 192.168.1.57:8004/$IMAGE_NAME && docker push 192.168.1.57:8004/$IMAGE_NAME" docker_build() { - docker build -t ${IMAGE_NAME} --progress=plain . + docker build -t ${IMAGE_NAME} --progress=plain . } docker_up() { - docker build -t ${IMAGE_NAME} --progress=plain . && docker tag $IMAGE_NAME 192.168.1.57:8004/$IMAGE_NAME && docker push 192.168.1.57:8004/$IMAGE_NAME + docker build -t ${IMAGE_NAME} --progress=plain . && docker tag $IMAGE_NAME 192.168.1.57:8004/$IMAGE_NAME && docker push 192.168.1.57:8004/$IMAGE_NAME } diff --git a/rua-scripts/ssh-forward.sh b/rua-scripts/linux/ssh-forward.sh similarity index 100% rename from rua-scripts/ssh-forward.sh rename to rua-scripts/linux/ssh-forward.sh diff --git a/rua-scripts/xdg-startup.sh b/rua-scripts/linux/xdg-startup.sh similarity index 100% rename from rua-scripts/xdg-startup.sh rename to rua-scripts/linux/xdg-startup.sh diff --git a/rua-scripts/scp_vim.sh b/rua-scripts/scp_vim.sh new file mode 100644 index 0000000..0b139b5 --- /dev/null +++ b/rua-scripts/scp_vim.sh @@ -0,0 +1,14 @@ +#!/bin/env bash + +# scp ~/.vimrc root@192.168.1.16:/home/root/.vimrc +scp_vim() { + if [ -z "$1" ]; then + echo "Usage: scp_vim " + return 1 + fi + + HOST=$1 + + scp ~/.vimrc $HOST:~/.vimrc + scp -r -O ~/.vim $HOST:~/.vim +} diff --git a/rua-scripts/show-client.sh b/rua-scripts/show-client.sh deleted file mode 100644 index fa628d4..0000000 --- a/rua-scripts/show-client.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -## 16 3.0 root -build-v3-editor() { - nvm use && yarn && yarn build-v3 && scp -rp build/* root@192.168.1.16:/home/wwwroot/exhibitor/editormeta || exit 1 - echo "Upload build-v3-editor done" -} -build-v3-viewer() { - nvm use && yarn && yarn build-v3-viewer && scp -rp build/* root@192.168.1.16:/home/wwwroot/design_meta || exit 1 - echo "Upload build-v3-viewer done" -} - -## 16 2.0 root -build-v2-editor() { - nvm use && yarn && yarn build-v3 && scp -rp build/* root@192.168.1.16:/home/wwwroot/exhibitor/editor || exit 1 - echo "Upload build-v2-editor done" -} -build-v2-viewer() { - nvm use && yarn && yarn build-v3-viewer && scp -rp build/* root@192.168.1.16:/home/wwwroot/design || exit 1 - echo "Upload build-v2-viewer done" -} - -## 13 2.0 -build-13-v2-editor() { - nvm use && yarn && yarn build && sshpass -f ~/passwd/13.txt scp -r build/* exhibitor@192.168.1.13:/editor || exit 1 - echo "Upload build-13-v2-editor done" -} -build-13-v2-viewer() { - nvm use && yarn && yarn buildviewer && sshpass -f ~/passwd/13.txt scp -r build/* design@192.168.1.13:/ || exit 1 - echo "Upload build-13-v2-viewer done" -} - -## 羚羊 2.0 -build-ly-v2-editor() { - nvm use && yarn && yarn buildlingyang && sshpass -f ~/passwd/lingyang.txt scp -P 106 -r build/* exhibitor@124.70.207.176:/editor || exit 1 - echo "Upload build-ly-v2-editor done" -} - -build-ly-v2-viewer() { - nvm use && yarn && yarn generate-lingyang && sshpass -f ~/passwd/lingyang.txt scp -P 106 -r build/* design@124.70.207.176:/ || exit 1 - echo "Upload build-ly-v2-viewer done" -} - -## 正式服务器 -build-pub-v3-viewer() { - nvm use && yarn && yarn buildviewerpub-rel && scp -r build/* root@129.211.172.57:/home/wwwroot/design_meta/ || exit 1 - echo "Upload build-pub-v3-viewer done" -} -build-pub-v3-editor() { - nvm use && yarn && yarn buildpub && sshpass -f ~/passwd/lingyang.txt scp -r build/* exhibitor@129.211.172.57:/editormeta || exit 1 - echo "Upload build-pub-v3-editor done" -} diff --git a/zsh/zshrc b/zsh/zshrc index 7feb35f..de44646 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -72,7 +72,7 @@ fi # macos if [[ $OSTYPE == "darwin"* ]]; then -# rust library + # rust library export PATH="/opt/homebrew/opt/libpq/bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/libpq/lib" export CPPFLAGS="-I/opt/homebrew/opt/libpq/include" @@ -105,13 +105,18 @@ if [ -r $LOCAL_SCRIPT_DIR/local.sh ]; then fi export RUA_SCRIPT_DIR=~/.config/rua-scripts/ -if [ -r $RUA_SCRIPT_DIR/xdg-startup.sh ]; then - source ~/.config/rua-scripts/xdg-startup.sh - source ~/.config/rua-scripts/docker.sh - source ~/.config/rua-scripts/show-client.sh - source ~/.config/rua-scripts/rua-tag.sh - source ~/.config/rua-scripts/ssh-forward.sh +if [ -d $RUA_SCRIPT_DIR ]; then + for script in $RUA_SCRIPT_DIR/*.sh; do + source $script + done fi +# if [ -r $RUA_SCRIPT_DIR/xdg-startup.sh ]; then +# source ~/.config/rua-scripts/xdg-startup.sh +# source ~/.config/rua-scripts/docker.sh +# source ~/.config/rua-scripts/show-client.sh +# source ~/.config/rua-scripts/rua-tag.sh +# source ~/.config/rua-scripts/ssh-forward.sh +# fi # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh @@ -126,14 +131,14 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] fi if [[ $OSTYPE == "darwin"* ]]; then - # Add deno completions to search path - if [[ ":$FPATH:" != *":/Users/xfy/.zsh/completions:"* ]]; then export FPATH="/Users/xfy/.zsh/completions:$FPATH"; fi - . "/Users/xfy/.deno/env" + # Add deno completions to search path + if [[ ":$FPATH:" != *":/Users/xfy/.zsh/completions:"* ]]; then export FPATH="/Users/xfy/.zsh/completions:$FPATH"; fi + . "/Users/xfy/.deno/env" fi if [[ $OSTYPE == "linux"* ]]; then - if [[ ":$FPATH:" != *":/home/xfy/.zsh/completions:"* ]]; then export FPATH="/home/xfy/.zsh/completions:$FPATH"; fi - . "/home/xfy/.deno/env" - # Wasmer - export WASMER_DIR="/home/xfy/.wasmer" - [ -s "$WASMER_DIR/wasmer.sh" ] && source "$WASMER_DIR/wasmer.sh" + if [[ ":$FPATH:" != *":/home/xfy/.zsh/completions:"* ]]; then export FPATH="/home/xfy/.zsh/completions:$FPATH"; fi + . "/home/xfy/.deno/env" + # Wasmer + export WASMER_DIR="/home/xfy/.wasmer" + [ -s "$WASMER_DIR/wasmer.sh" ] && source "$WASMER_DIR/wasmer.sh" fi