Skip to content

Remove duplicate line #3927

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

Merged
merged 3 commits into from
Jul 3, 2024
Merged

Remove duplicate line #3927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
550cc16
Remove duplicate line
benjaminjb Jun 5, 2024
7fb149a
Remove duplicate line
benjaminjb Jun 5, 2024
5899368
fix tests
benjaminjb Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions internal/pgadmin/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ RED="\033[0;31m"
GREEN="\033[0;32m"
RESET="\033[0m"

CRUNCHY_DIR=${CRUNCHY_DIR:-'/opt/crunchy'}

function enable_debugging() {
if [[ ${CRUNCHY_DEBUG:-false} == "true" ]]
then
Expand Down Expand Up @@ -130,8 +128,6 @@ then
err_check "$?" "pgAdmin4 Database Setup" "Could not create pgAdmin4 database: \n$(cat /tmp/pgadmin4.stderr)"
fi

cd ${PGADMIN_DIR?}

echo_info "Starting Apache web server.."
/usr/sbin/httpd -D FOREGROUND &
echo $! > $APACHE_PIDFILE
Expand Down
8 changes: 0 additions & 8 deletions internal/pgadmin/reconcile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ containers:
GREEN="\033[0;32m"
RESET="\033[0m"

CRUNCHY_DIR=${CRUNCHY_DIR:-'/opt/crunchy'}

function enable_debugging() {
if [[ ${CRUNCHY_DEBUG:-false} == "true" ]]
then
Expand Down Expand Up @@ -204,8 +202,6 @@ containers:
err_check "$?" "pgAdmin4 Database Setup" "Could not create pgAdmin4 database: \n$(cat /tmp/pgadmin4.stderr)"
fi

cd ${PGADMIN_DIR?}

echo_info "Starting Apache web server.."
/usr/sbin/httpd -D FOREGROUND &
echo $! > $APACHE_PIDFILE
Expand Down Expand Up @@ -355,8 +351,6 @@ containers:
GREEN="\033[0;32m"
RESET="\033[0m"

CRUNCHY_DIR=${CRUNCHY_DIR:-'/opt/crunchy'}

function enable_debugging() {
if [[ ${CRUNCHY_DEBUG:-false} == "true" ]]
then
Expand Down Expand Up @@ -442,8 +436,6 @@ containers:
err_check "$?" "pgAdmin4 Database Setup" "Could not create pgAdmin4 database: \n$(cat /tmp/pgadmin4.stderr)"
fi

cd ${PGADMIN_DIR?}

echo_info "Starting Apache web server.."
/usr/sbin/httpd -D FOREGROUND &
echo $! > $APACHE_PIDFILE
Expand Down