diff --git a/acme-setup-all.sh b/acme-setup-all.sh index 6ed0a87..d55aee1 100644 --- a/acme-setup-all.sh +++ b/acme-setup-all.sh @@ -64,12 +64,6 @@ then echo fi -# if [ "$ISSUEMODE" == 'c' ] -# then -# echo " === DNS API provider, for instance yuanjin.cc" -# read -p " >>> " CHALLENGE_ALIAS -# fi - echo "*** Issue Certificate:" echo "*** ~/.acme.sh/acme.sh --issue -d $TARGET_HOSTNAME $ISSUEPARM $DNSAPI" echo "***" diff --git a/git-ignore-merge-here.sh b/git-ignore-merge-here.sh index 3d22bd9..93b0e16 100644 --- a/git-ignore-merge-here.sh +++ b/git-ignore-merge-here.sh @@ -1,5 +1,6 @@ #!/bin/bash -echo === Merge [.gitignore_global] and [.gitignore_local] to [.gitignore] === -curl -sSL https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/.gitignore_global > .gitignore && cat .gitignore_local >> .gitignore +echo === Merge remote [.gitignore_global] and local [.gitignore_local] to [.gitignore] === +curl -sSL https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/.gitignore_global > .gitignore +if [ -f .gitignore_local ]; then cat .gitignore_local >> .gitignore; fi; echo diff --git a/nixhome/.bashrc b/nixhome/.bashrc index 92d35bc..630ae7d 100644 --- a/nixhome/.bashrc +++ b/nixhome/.bashrc @@ -114,7 +114,7 @@ fi # color starts with \[\033[${ColorCode}m\] and ends with \[\033[00m\], in which the $ColorCode is `$Style$Type$Code`, for example, $Style=01; means text in bold, $Type=3 means text color, $Type=4 means background color, $Code could be 0-7 for pre-defined colors. if [ "$color_prompt" = yes ]; then - PS1='<\[\033[01;42m\]\t\[\033[00m\]#\[\033[01;44m\]\u\[\033[00m\]@\[\033[01;46m\]\h\[\033[00m\]:\[\033[01;41m\]\w\[\033[00m\]> ' + PS1='<\[\033[01;42m\]\t\[\033[00m\]#\[\033[01;43m\]\u\[\033[00m\]@\[\033[01;46m\]\h\[\033[00m\]:\[\033[01;41m\]\w\[\033[00m\]> ' else PS1='<\t#\u@\h:\w> ' fi diff --git a/seafile-ignore-merge-here.sh b/seafile-ignore-merge-here.sh new file mode 100644 index 0000000..e26d61f --- /dev/null +++ b/seafile-ignore-merge-here.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +echo === Merge remote [seafile-ignore_global] and local [seafile-ignore_local] to [seafile-ignore.txt] === +curl -sSL https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/seafile-ignore_global > seafile-ignore.txt +if [ -f seafile-ignore_local ]; then cat seafile-ignore_local >> seafile-ignore.txt; fi +echo