Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ability to set deployedsha1file instead of hardcoded. Both command li… #605

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ability to set deployedsha1file instead of hardcoded. Both command li… #605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion git-ftp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ OPTIONS
--enable-post-errors Fails if post-ftp-push hook raises an error
--disable-epsv Tell curl to disable the use of the EPSV command when doing passive FTP transfers. Curl will normally always first attempt to use EPSV before PASV, but with this option, it will not try using EPSV.
--auto-init Automatically run init action when running push action
--deployedsha1file The name of the file that keeps the SHA1 hash of the current git commit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting is a bit off here.

--version Prints version.
-x, --proxy Use the specified proxy.

Expand Down Expand Up @@ -383,7 +384,12 @@ get_config() {
}

set_deployed_sha1_file() {
DEPLOYED_SHA1_FILE="$(get_config deployedsha1file "$DEPLOYED_SHA1_FILE")"
DEPLOYED_SHA1_FILE_CONFIG="$(get_config deployedsha1file)"
if [ -z "$DEPLOYED_SHA1_FILE_CONFIG" ]; then
DEPLOYED_SHA1_FILE="$(get_config deployedsha1file "$DEPLOYED_SHA1_FILE")" #If none in config, rerun with harcoded value
else
DEPLOYED_SHA1_FILE=$DEPLOYED_SHA1_FILE_CONFIG
fi
Comment on lines -386 to +392
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this change. The old line should have done exactly the same. If the config variable is set then $(get_config deployedsha1file "$DEPLOYED_SHA1_FILE") will return the config option. If it's not set then it will return the original value of $DEPLOYED_SHA1_FILE.

}

# Simple log func
Expand Down Expand Up @@ -1810,6 +1816,10 @@ do
write_log "Auto init if needed."
fi
;;
--deployedsha1file)
DEPLOYED_SHA1_FILE="$2"
shift
;;
-x|--proxy*)
case "$#,$1" in
*,*=*)
Expand Down