From ec8a92e695c7afba0d0f08f989dba0b288beae8f Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Sat, 9 Oct 2021 23:19:35 +0800 Subject: [PATCH 1/3] fix: for ubuntu --- cli/nnn.sh | 17 ++++++++++++++--- devel/nodejs.sh | 13 +++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/cli/nnn.sh b/cli/nnn.sh index 3fc1d92..a27f0fb 100755 --- a/cli/nnn.sh +++ b/cli/nnn.sh @@ -6,17 +6,28 @@ DIR=$(dirname "$(readlink -f "$0")") log 'Setting up nnn' +$NNN_CONFIG_DIR="$XDG_CONFIG_HOME/nnn/plugins" + # setup package mirror for CHINA case "$PM" in apt) - echo TODO - exit -1 + mkdir -p ~/.local/bin + HTTPS_PROXY=$GITHUB_PROXY curl -Lo /tmp/nnn.tar.gz https://github.com/jarun/nnn/releases/download/v4.3/nnn-static-4.3.x86_64.tar.gz + cd /tmp + tar zxvf nnn.tar.gz + mv nnn-static ~/.local/bin/nnn + rm -rf nnn.tar.gz + cd - + + mkdir -p "$NNN_CONFIG_DIR" + HTTPS_PROXY=$GITHUB_PROXY curl -Lo "$NNN_CONFIG_DIR/plugins/fzcd" https://github.com/jarun/nnn/raw/master/plugins/fzcd + HTTPS_PROXY=$GITHUB_PROXY curl -Lo "$NNN_CONFIG_DIR/plugins/preview-tui" https://github.com/jarun/nnn/raw/master/plugins/preview-tui ;; pacman) sudo pacman -S --noconfirm --needed nnn yay -S --noconfirm --needed dragon-drag-and-drop + cp -r /usr/share/nnn/plugins/. "$NNN_CONFIG_DIR" esac # configuration lnsf "$DIR/nnn/n.fish" "$XDG_CONFIG_HOME/fish/functions/n.fish" -cp -r /usr/share/nnn/plugins/. "$XDG_CONFIG_HOME/nnn/plugins" diff --git a/devel/nodejs.sh b/devel/nodejs.sh index aa61932..d18d0a6 100755 --- a/devel/nodejs.sh +++ b/devel/nodejs.sh @@ -7,11 +7,12 @@ DIR=$(dirname "$(readlink -f "$0")") FILES_PATH=$PREFIX/nodejs NODE_BIN=$PREFIX/bin/node NODE_URL=https://nodejs.org/dist -NODE_VERSION=v14.15.4 +NODE_VERSION=v14.18.0 NPM_BIN=npm +NPM_CONFIG_REGISTRY= if in_china; then - NPM_REGISTRY_URL=https://npmreg.mirrors.ustc.edu.cn - NODE_URL=$NPM_REGISTRY + export NPM_CONFIG_REGISTRY=https://registry.npmmirror.com + NODE_URL=https://npmmirror.com/mirrors/node NPM_BIN=npm fi export NPM_BIN @@ -61,14 +62,14 @@ install() { | sudo tee "$FILES_PATH" >/dev/null # remove download path rm "/tmp/$NAME" - sudo npm install -g yarn configure_nodejs } configure_nodejs() { if in_china; then - echo "registry=$NPM_REGISTRY_URL" > ~/.npmrc - yarnpkg config set registry $NPM_REGISTRY_URL --global + echo "registry=$NPM_CONFIG_REGISTRY" > ~/.npmrc + ! has_cmd yarnpkg && sudo npm install -g yarn + yarnpkg config set registry $NPM_CONFIG_REGISTRY --global #yarnpkg config set disturl https://npm.taobao.org/dist --global #yarnpkg config set sass_binary_site https://npm.taobao.org/mirrors/node-sass --global #yarnpkg config set electron_mirror https://npm.taobao.org/mirrors/electron/ --global From 6b7cfda0d82409d84d3fc201e7867a55993c04ad Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Sun, 10 Oct 2021 15:30:47 +0800 Subject: [PATCH 2/3] docs: add holiday calendar --- gui/thunderbird.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gui/thunderbird.md b/gui/thunderbird.md index 8376d33..74f18be 100644 --- a/gui/thunderbird.md +++ b/gui/thunderbird.md @@ -10,3 +10,10 @@ - tbsync - provider for caldav & carddav: for nextcloud synchronization - provider for exchange activesync: for outlook synchronization + +# Holiday Calendar + +Create new calendar -> On the Network + +1. [canada holidy](https://www.officeholidays.com/subscribe/canada) +2. [chinese holiday](https://www.officeholidays.com/subscribe/china) From cca16ec6ed9537456f97ab075ec23c7a09f81719 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Sun, 10 Oct 2021 21:48:42 +0800 Subject: [PATCH 3/3] fix: missing semicolon --- devel/python.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/devel/python.sh b/devel/python.sh index 8a959ca..dd70b45 100755 --- a/devel/python.sh +++ b/devel/python.sh @@ -20,6 +20,7 @@ case "$PM" in pkg) pkg install python pip install virtualfish + ;; apt) #for older ubuntu distro #sudo add-apt-repository ppa:deadsnakes/ppa