diff --git a/.github/commands/bump-azure b/.github/commands/bump-azure index 087873f17..fb6a186d2 100755 --- a/.github/commands/bump-azure +++ b/.github/commands/bump-azure @@ -45,7 +45,7 @@ main() { echo "=====> Creating upstream pull request" ../$GH_FOLDER/bin/gh pr create --head dokku:dokku-$VERSION --repo Azure/azure-quickstart-templates --title 'Update dokku-vm dokku version to 0.23.7' --body '' - popd >/dev/null + popd &>/dev/null } main "$@" diff --git a/.github/commands/ci-run b/.github/commands/ci-run index aad5ed2f2..88256ef92 100755 --- a/.github/commands/ci-run +++ b/.github/commands/ci-run @@ -7,7 +7,7 @@ main() { mkdir -p test-results/bats pushd tests/unit >/dev/null bats --report-formatter junit --output ../../test-results/bats "$FILE_NAME.bats" - popd >/dev/null + popd &>/dev/null ls -lah test-results/bats } diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index da4ac32ef..bc540b7f0 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -1284,7 +1284,7 @@ REV="$3" # optional, may not be sent for tar-based builds pushd "$TMP_WORK_DIR" >/dev/null touch Procfile echo "clock: some-command" >> Procfile -popd >/dev/null +popd &>/dev/null ``` ### `post-proxy-ports-update` diff --git a/plugins/builder-herokuish/post-app-clone-setup b/plugins/builder-herokuish/post-app-clone-setup index 5d79dda88..3abb15417 100755 --- a/plugins/builder-herokuish/post-app-clone-setup +++ b/plugins/builder-herokuish/post-app-clone-setup @@ -14,7 +14,7 @@ trigger-builder-herokuish-post-app-clone-setup() { pushd "$DOKKU_ROOT/$OLD_APP/." >/dev/null find ./* \( -name ".cache" -o -name "cache" \) -prune -o -print | cpio -pdmu --quiet "$DOKKU_ROOT/$NEW_APP" - popd >/dev/null 2>&1 || pushd "/tmp" >/dev/null + popd &>/dev/null || pushd "/tmp" >/dev/null if [[ -d "$NEW_CACHE_DIR" ]] && ! rmdir "$NEW_CACHE_DIR"; then local DOCKER_RUN_LABEL_ARGS="--label=com.dokku.app-name=$NEW_APP" diff --git a/plugins/builder-herokuish/post-app-rename-setup b/plugins/builder-herokuish/post-app-rename-setup index 8c8d8ddfe..2c96153a8 100755 --- a/plugins/builder-herokuish/post-app-rename-setup +++ b/plugins/builder-herokuish/post-app-rename-setup @@ -20,7 +20,7 @@ trigger-builder-herokuish-post-app-clone-setup() { pushd "$DOKKU_ROOT/$OLD_APP/." >/dev/null find ./* \( -name ".cache" -o -name "cache" \) -prune -o -print | cpio -pdmu --quiet "$DOKKU_ROOT/$NEW_APP" - popd >/dev/null 2>&1 || pushd "/tmp" >/dev/null + popd &>/dev/null || pushd "/tmp" >/dev/null } trigger-builder-herokuish-post-app-clone-setup "$@" diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions index 0c956dfba..bd43827a7 100755 --- a/plugins/git/internal-functions +++ b/plugins/git/internal-functions @@ -245,7 +245,7 @@ fn-git-cmd() { pushd "$GIT_DIR" >/dev/null git "$@" exit_code="$?" - popd >/dev/null 2>&1 || pushd "/tmp" >/dev/null + popd &>/dev/null || pushd "/tmp" >/dev/null return $exit_code } @@ -383,7 +383,7 @@ fn-git-setup-build-dir-submodules() { if [[ "$DOKKU_KEEP_GIT_DIR" != "true" ]]; then pushd "$GIT_WORKDIR" >/dev/null find "$GIT_WORKDIR" -name .git -prune -exec rm -rf {} \; >/dev/null - popd >/dev/null 2>&1 || pushd "/tmp" >/dev/null + popd &>/dev/null || pushd "/tmp" >/dev/null fi }