Remove some trivial helper functions

They were actually leading to double password reading
in the `load` command.

Author: eldering

sql/dj_setup_database.in

@@ -272,23 +272,6 @@ install_examples()
 	( cd "$EXAMPLEPROBDIR" && yes y | "$BINDIR"/import-contest )
 }
 
-uninstall_helper()
-{
-	read_dbpasswords
-	remove_db_users
-}
-
-create_db_users_helper()
-{
-	read_dbpasswords
-	create_db_users
-	verbose "Created empty database and users."
-}
-
-create_database_dump () {
-	mysqldump $(mysql_options) --opt --skip-lock-tables "$DBNAME" | pv | gzip > "$DATABASEDUMPDIR/${1}.sql.gz"
-}
-
 ### Script starts here ###
 
 # Parse command-line options:
@@ -345,7 +328,8 @@ genpass)
 	;;
 
 uninstall)
-	uninstall_helper
+	read_dbpasswords
+	remove_db_users
 	;;
 
 install-examples)
@@ -364,7 +348,8 @@ install-loadtest)
 	;;
 
 create-db-users)
-	create_db_users_helper
+	read_dbpasswords
+	create_db_users
 	;;
 
 update-password)
@@ -413,7 +398,8 @@ dump)
 		exit 1
 	fi
 
-	if [ -f "${DATABASEDUMPDIR}/${DUMPNAME}.sql.gz" ]; then
+	DUMPFILE="${DATABASEDUMPDIR}/${DUMPNAME}.sql.gz"
+	if [ -f "$DUMPFILE" ]; then
 		while true; do
 			printf "Overwrite existing database dump (y/N)? "
 			read -r yn
@@ -423,7 +409,7 @@ dump)
 			esac
 		done
 	fi
-	create_database_dump "$DUMPNAME"
+	mysqldump $(mysql_options) --opt --skip-lock-tables "$DBNAME" | pv | gzip > "$DUMPFILE"
 	;;
 
 load)
@@ -465,8 +451,8 @@ load)
 	fi
 
 	read_dbpasswords
-	uninstall_helper
-	create_db_users_helper
+	remove_db_users
+	create_db_users
 	pv "${FILE}" | gunzip | mysql "$DBNAME"
 	;;