plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-25 14:41:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10 from Neilpang/dev

Browse Source 
polish install/uninstall messages.
This commit is contained in:
Neil 2015-12-28 13:10:43 +08:00
commit 8902b560bc
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
le.sh
View File

@ -512,28 +512,28 @@ renewAll() {
install() { install() {
_initpath _initpath
if ! command -v "curl" ; then if ! command -v "curl" > /dev/null ; then
_info "Please install curl first." _err "Please install curl first."
_info "Ubuntu: sudo apt-get install curl" _err "Ubuntu: sudo apt-get install curl"
_info "CentOS: yum install curl" _err "CentOS: yum install curl"
return 1 return 1
fi fi
if ! command -v "crontab" ; then if ! command -v "crontab" > /dev/null ; then
_info "Please install crontab first." _err "Please install crontab first."
_info "CentOs: yum -y install crontabs" _err "CentOs: yum -y install crontabs"
return 1 return 1
fi fi
if ! command -v "openssl" ; then if ! command -v "openssl" > /dev/null ; then
_info "Please install openssl first." _err "Please install openssl first."
_info "CentOs: yum -y install openssl" _err "CentOs: yum -y install openssl"
return 1 return 1
fi fi
if ! command -v "xxd" ; then if ! command -v "xxd" > /dev/null ; then
_info "Please install xxd first." _err "Please install xxd first."
_info "CentOs: yum install vim-common" _err "CentOs: yum install vim-common"
return 1 return 1
fi fi
@ -553,10 +553,10 @@ install() {
_info "Installing cron job" _info "Installing cron job"
if ! crontab -l | grep 'le.sh renewAll' ; then if ! crontab -l | grep 'le.sh renewAll' ; then
crontab -l | { cat; echo "0 0 * * * le.sh renewAll"; } | crontab - crontab -l | { cat; echo "0 0 * * * le.sh renewAll"; } | crontab -
if command -v crond ; then if command -v crond > /dev/null ; then
service cron reload service crond reload 2>/dev/null
else else
service cron restart service cron reload 2>/dev/null
fi fi
fi fi
@ -567,7 +567,15 @@ install() {
uninstall() { uninstall() {
_initpath _initpath
_info "Removing cron job" _info "Removing cron job"
crontab -l | sed "/le.sh renewAll/d" | crontab -
if ! crontab -l | grep 'le.sh renewAll' ; then
crontab -l | sed "/le.sh renewAll/d" | crontab -
if command -v crond > /dev/null ; then
service crond reload 2>/dev/null
else
service cron reload 2>/dev/null
fi
fi
_info "Removing /bin/le.sh" _info "Removing /bin/le.sh"
rm -f /bin/le rm -f /bin/le