github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: use apps_exists helper where appropriate

Browse Source 
This centralizes the logic around checking if an application exists.
This commit is contained in:
Jose Diaz-Gonzalez
2018-04-02 00:37:10 -04:00
parent 5b4d6dc6eb
commit 72f53f9f1b
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/git/functions
View File

@@ -37,7 +37,7 @@ git_build_app_repo() {
chmod 755 "$GIT_BUILD_APP_REPO_TMP_WORK_DIR"
unset GIT_DIR GIT_WORK_TREE
[[ ! -d "$DOKKU_ROOT/$APP" ]] && apps_maybe_create "$APP"
! apps_exists "$APP" > /dev/null 2>&1 && apps_maybe_create "$APP"
if use_git_worktree; then
# git worktree - this method uses git worktree which was introduced in git 2.5
@@ -194,7 +194,7 @@ git_upload_pack_cmd() {
declare APP="$2"
APP="$(echo "$APP" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
is_valid_app_name "$APP"
[[ ! -d "$DOKKU_ROOT/$APP" ]] && apps_maybe_create "$APP"
! apps_exists "$APP" > /dev/null 2>&1 && apps_maybe_create "$APP"
plugn trigger git-pre-pull "$APP"
cat | git-upload-pack "$DOKKU_ROOT/$APP"
@@ -209,7 +209,7 @@ git_glob_cmd() {
is_valid_app_name "$APP"
if [[ $1 == "git-receive-pack" && ! -d "$APP_PATH/refs" ]]; then
[[ ! -d "$DOKKU_ROOT/$APP" ]] && apps_maybe_create "$APP"
! apps_exists "$APP" > /dev/null 2>&1 && apps_maybe_create "$APP"
fn-git-create-hook "$APP"
fi