Commit f9a1b641 authored by neil's avatar neil
Browse files

remove sudo from crontab

parent 18d10a9c
#!/bin/bash #!/bin/bash
VER=1.1.6 VER=1.1.7
PROJECT="https://github.com/Neilpang/le" PROJECT="https://github.com/Neilpang/le"
DEFAULT_CA="https://acme-v01.api.letsencrypt.org" DEFAULT_CA="https://acme-v01.api.letsencrypt.org"
...@@ -322,13 +322,6 @@ _stopserver() { ...@@ -322,13 +322,6 @@ _stopserver() {
_initpath() { _initpath() {
#check if there is sudo installed, AND if the current user is a sudoer.
if command -v sudo > /dev/null ; then
if [ "$(sudo -n uptime 2>&1|grep "load"|wc -l)" != "0" ] ; then
SUDO=sudo
fi
fi
if [ -z "$LE_WORKING_DIR" ]; then if [ -z "$LE_WORKING_DIR" ]; then
LE_WORKING_DIR=$HOME/.le LE_WORKING_DIR=$HOME/.le
fi fi
...@@ -1043,7 +1036,7 @@ installcronjob() { ...@@ -1043,7 +1036,7 @@ installcronjob() {
_err "Can not install cronjob, le.sh not found." _err "Can not install cronjob, le.sh not found."
return 1 return 1
fi fi
crontab -l | { cat; echo "0 0 * * * $SUDO LE_WORKING_DIR=\"$LE_WORKING_DIR\" $lesh cron > /dev/null"; } | crontab - crontab -l | { cat; echo "0 0 * * * LE_WORKING_DIR=\"$LE_WORKING_DIR\" $lesh cron > /dev/null"; } | crontab -
fi fi
return 0 return 0
} }
...@@ -1138,7 +1131,14 @@ _initconf() { ...@@ -1138,7 +1131,14 @@ _initconf() {
install() { install() {
_initpath _initpath
#check if there is sudo installed, AND if the current user is a sudoer.
if command -v sudo > /dev/null ; then
if [ "$(sudo -n uptime 2>&1|grep "load"|wc -l)" != "0" ] ; then
SUDO=sudo
fi
fi
if command -v yum > /dev/null ; then if command -v yum > /dev/null ; then
YUM="1" YUM="1"
INSTALL="$SUDO yum install -y " INSTALL="$SUDO yum install -y "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment