Cleanups in the sql scripts

db_scripts/init_rmps_db.sh

@@ -17,7 +17,7 @@ pass_hash=`printf ${newuser_pass}${salt}|sha512sum|head -c 128`
 #printf "\nSalt = $salt"
 #printf "\nHash = $pass_hash\n"
 
-mysql -u rmps --password="$dbpass" -e "set @loginName=\"$adminpass\";\
+mysql -u rmps --password="$dbpass" -e "\
 	set @loginName=\"$username\";\
 	set @fullName=\"$fullname\";\
 	set @eMail=\"$email\";\

db_scripts/init_rmps_db.sql

@@ -114,8 +114,6 @@ INSERT INTO `rmps`.`job_types` (`descr`) VALUES ('Detect OS');
 INSERT INTO `rmps`.`job_types` (`descr`) VALUES ('Detect UNIX kernel');
 INSERT INTO `rmps`.`job_types` (`descr`) VALUES ('Get memory status');
 
-/* Setup the admin user */
-
 /* Define the procedures */
 DELIMITER $$
 
@@ -154,6 +152,8 @@ BEGIN
 		SET output = 1;
 	END IF;
 END $$
+
+/* Setup the admin user */
 call addUser(@loginName, @fullName, @eMail, @passHash, @passSalt, 0, @output);
 
 DROP PROCEDURE IF EXISTS `rmps`.`deactivateUser` $$