Merge branch 'master' into feature-config-golang

This commit is contained in:
Jose Diaz-Gonzalez
2017-10-06 11:13:15 -04:00
committed by GitHub
5 changed files with 17 additions and 10 deletions

View File

@@ -152,8 +152,9 @@ git_build() {
git_upload_pack_cmd() {
declare desc="executes git-upload-pack"
local cmd="git-upload-pack"
local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')"
declare cmd="git-upload-pack"
declare APP="$2"
APP="$(echo "$APP" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
is_valid_app_name "$APP"
plugn trigger git-pre-pull "$APP"
cat | git-upload-pack "$DOKKU_ROOT/$APP"

View File

@@ -41,7 +41,7 @@ func reportSingleApp(appName, infoFlag string) {
common.LogFail(fmt.Sprintf("Invalid flag passed, valid flags: %s", strings.Join(strkeys, ", ")))
}
// set or clear a network property for an app
// displays a network report for one or more apps
func main() {
flag.Parse()
appName := flag.Arg(1)