From 4260a32e80adac3e74f1a1d5e44b9a2bc56e3130 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 26 Mar 2016 13:30:09 +0100
Subject: [PATCH] Fixing variables

---
 inspection.sh  | 1 -
 private.tpl.sh | 4 ----
 setup.sh       | 1 -
 var.sh         | 2 ++
 4 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 private.tpl.sh

diff --git a/inspection.sh b/inspection.sh
index 38e6f47..0515178 100644
--- a/inspection.sh
+++ b/inspection.sh
@@ -2,7 +2,6 @@
 
 # Include
 . var.sh
-. ${ROOT_PATH}/private.sh
 
 # Executing unit tests
 php ${ROOT_PATH}/phpunit.phar --configuration ${ROOT_PATH}/${TEST_PATH}/PHPUnit/phpunit_default.xml > ${ROOT_PATH}/${BUILD_PATH}/logs/phpunit.log
diff --git a/private.tpl.sh b/private.tpl.sh
deleted file mode 100644
index 96232a6..0000000
--- a/private.tpl.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-DB_PASSWORD="123456"
-DB_USER="root"
diff --git a/setup.sh b/setup.sh
index 9bdb4fd..8c71aa1 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 . var.sh
-. ${ROOT_PATH}/private.sh
 
 # Previous cleanup
 rm -r -f ${ROOT_PATH}
diff --git a/var.sh b/var.sh
index 07e8b68..9fb3359 100644
--- a/var.sh
+++ b/var.sh
@@ -8,6 +8,8 @@ RELEASE_PATH="Release"
 TEST_PATH="Tests"
 WEB_URL="http://orange-management.de"
 MAIL_ADDR=""
+DB_USER="root"
+DB_PASSWORD="123456"
 
 # Git variables
 GITHUB_URL[0]="https://github.com/Orange-Management/Orange-Management.git"