yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-05-05 09:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1009f7f0bca80f5b5561fba391b7ac370c4c61ae into bb25febd70cc45e257b349495113c7f282ab8ea0

Browse Source
This commit is contained in:
Archie L. Cobbs 2016-10-08 19:28:17 +00:00 committed by GitHub
commit 2825ac5e0e
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
acme.sh
View File

@ -3120,7 +3120,7 @@ _detect_profile() {
_initconf() { _initconf() {
_initpath _initpath
if [ ! -f "$ACCOUNT_CONF_PATH" ] ; then if [ ! -f "$DESTDIR$ACCOUNT_CONF_PATH" ] ; then
echo "#ACCOUNT_CONF_PATH=xxxx echo "#ACCOUNT_CONF_PATH=xxxx
#Account configurations: #Account configurations:
@ -3173,7 +3173,7 @@ _initconf() {
# #
#GD_Secret=\"sADDsdasdfsdfdssdgdsf\" #GD_Secret=\"sADDsdasdfsdfdssdgdsf\"
" > $ACCOUNT_CONF_PATH " > $DESTDIR$ACCOUNT_CONF_PATH
fi fi
} }
@ -3230,7 +3230,7 @@ _setShebang() {
_installalias() { _installalias() {
_initpath _initpath
_envfile="$LE_WORKING_DIR/$PROJECT_ENTRY.env" _envfile="$DESTDIR$LE_WORKING_DIR/$PROJECT_ENTRY.env"
if [ "$_upgrading" ] && [ "$_upgrading" = "1" ] ; then if [ "$_upgrading" ] && [ "$_upgrading" = "1" ] ; then
echo "$(cat $_envfile)" | sed "s|^LE_WORKING_DIR.*$||" > "$_envfile" echo "$(cat $_envfile)" | sed "s|^LE_WORKING_DIR.*$||" > "$_envfile"
echo "$(cat $_envfile)" | sed "s|^alias le.*$||" > "$_envfile" echo "$(cat $_envfile)" | sed "s|^alias le.*$||" > "$_envfile"
@ -3251,8 +3251,8 @@ _installalias() {
#for csh #for csh
_cshfile="$LE_WORKING_DIR/$PROJECT_ENTRY.csh" _cshfile="$DESTDIR$LE_WORKING_DIR/$PROJECT_ENTRY.csh"
_csh_profile="$HOME/.cshrc" _csh_profile="$DESTDIR$HOME/.cshrc"
if [ -f "$_csh_profile" ] ; then if [ -f "$_csh_profile" ] ; then
_setopt "$_cshfile" "setenv LE_WORKING_DIR" " " "\"$LE_WORKING_DIR\"" _setopt "$_cshfile" "setenv LE_WORKING_DIR" " " "\"$LE_WORKING_DIR\""
_setopt "$_cshfile" "alias $PROJECT_ENTRY" " " "\"$LE_WORKING_DIR/$PROJECT_ENTRY\"" _setopt "$_cshfile" "alias $PROJECT_ENTRY" " " "\"$LE_WORKING_DIR/$PROJECT_ENTRY\""
@ -3260,7 +3260,7 @@ _installalias() {
fi fi
#for tcsh #for tcsh
_tcsh_profile="$HOME/.tcshrc" _tcsh_profile="$DESTDIR$HOME/.tcshrc"
if [ -f "$_tcsh_profile" ] ; then if [ -f "$_tcsh_profile" ] ; then
_setopt "$_cshfile" "setenv LE_WORKING_DIR" " " "\"$LE_WORKING_DIR\"" _setopt "$_cshfile" "setenv LE_WORKING_DIR" " " "\"$LE_WORKING_DIR\""
_setopt "$_cshfile" "alias $PROJECT_ENTRY" " " "\"$LE_WORKING_DIR/$PROJECT_ENTRY\"" _setopt "$_cshfile" "alias $PROJECT_ENTRY" " " "\"$LE_WORKING_DIR/$PROJECT_ENTRY\""
@ -3307,45 +3307,45 @@ install() {
done done
fi fi
_info "Installing to $LE_WORKING_DIR" _info "Installing to $DESTDIR$LE_WORKING_DIR"
if ! mkdir -p "$LE_WORKING_DIR" ; then if ! mkdir -p "$DESTDIR$LE_WORKING_DIR" ; then
_err "Can not create working dir: $LE_WORKING_DIR" _err "Can not create working dir: $DESTDIR$LE_WORKING_DIR"
return 1 return 1
fi fi
chmod 700 "$LE_WORKING_DIR" chmod 700 "$DESTDIR$LE_WORKING_DIR"
cp $PROJECT_ENTRY "$LE_WORKING_DIR/" && chmod +x "$LE_WORKING_DIR/$PROJECT_ENTRY" cp $PROJECT_ENTRY "$DESTDIR$LE_WORKING_DIR/" && chmod +x "$DESTDIR$LE_WORKING_DIR/$PROJECT_ENTRY"
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
_err "Install failed, can not copy $PROJECT_ENTRY" _err "Install failed, can not copy $PROJECT_ENTRY"
return 1 return 1
fi fi
_info "Installed to $LE_WORKING_DIR/$PROJECT_ENTRY" _info "Installed to $DESTDIR$LE_WORKING_DIR/$PROJECT_ENTRY"
_installalias _installalias
if [ -d "dnsapi" ] ; then if [ -d "dnsapi" ] ; then
mkdir -p $LE_WORKING_DIR/dnsapi mkdir -p $DESTDIR$LE_WORKING_DIR/dnsapi
cp dnsapi/* $LE_WORKING_DIR/dnsapi/ cp dnsapi/* $DESTDIR$LE_WORKING_DIR/dnsapi/
fi fi
if [ ! -f "$ACCOUNT_CONF_PATH" ] ; then if [ ! -f "$DESTDIR$ACCOUNT_CONF_PATH" ] ; then
_initconf _initconf
fi fi
if [ "$_DEFAULT_ACCOUNT_CONF_PATH" != "$ACCOUNT_CONF_PATH" ] ; then if [ "$_DEFAULT_ACCOUNT_CONF_PATH" != "$ACCOUNT_CONF_PATH" ] ; then
_setopt "$_DEFAULT_ACCOUNT_CONF_PATH" "ACCOUNT_CONF_PATH" "=" "\"$ACCOUNT_CONF_PATH\"" _setopt "$DESTDIR$_DEFAULT_ACCOUNT_CONF_PATH" "ACCOUNT_CONF_PATH" "=" "\"$ACCOUNT_CONF_PATH\""
fi fi
if [ "$_DEFAULT_CERT_HOME" != "$CERT_HOME" ] ; then if [ "$_DEFAULT_CERT_HOME" != "$CERT_HOME" ] ; then
_saveaccountconf "CERT_HOME" "$CERT_HOME" _saveaccountconf "$DESTDIR$ACCOUNT_CONF_PATH" "CERT_HOME" "$CERT_HOME"
fi fi
if [ "$_DEFAULT_ACCOUNT_KEY_PATH" != "$ACCOUNT_KEY_PATH" ] ; then if [ "$_DEFAULT_ACCOUNT_KEY_PATH" != "$ACCOUNT_KEY_PATH" ] ; then
_saveaccountconf "ACCOUNT_KEY_PATH" "$ACCOUNT_KEY_PATH" _saveaccountconf "$DESTDIR$ACCOUNT_CONF_PATH" "ACCOUNT_KEY_PATH" "$ACCOUNT_KEY_PATH"
fi fi
if [ -z "$_nocron" ] ; then if [ -z "$_nocron" ] ; then
@ -3357,9 +3357,9 @@ install() {
if _exists bash ; then if _exists bash ; then
_info "Good, bash is installed, change the shebang to use bash as prefered." _info "Good, bash is installed, change the shebang to use bash as prefered."
_shebang='#!/usr/bin/env bash' _shebang='#!/usr/bin/env bash'
_setShebang "$LE_WORKING_DIR/$PROJECT_ENTRY" "$_shebang" _setShebang "$DESTDIR/$LE_WORKING_DIR/$PROJECT_ENTRY" "$_shebang"
if [ -d "$LE_WORKING_DIR/dnsapi" ] ; then if [ -d "$DESTDIR$LE_WORKING_DIR/dnsapi" ] ; then
for _apifile in $(ls "$LE_WORKING_DIR/dnsapi/"*.sh) ; do for _apifile in $(ls "$DESTDIR$LE_WORKING_DIR/dnsapi/"*.sh) ; do
_setShebang "$_apifile" "$_shebang" _setShebang "$_apifile" "$_shebang"
done done
fi fi