Merge remote-tracking branch 'upstream/master'

bin/compiler/1-clean.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

bin/compiler/2-configure.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

bin/compiler/3-build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

bin/compiler/compiler.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/includes/includes.sh"

bin/compiler/includes/defines.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # you can choose build type from cmd argument
 if [ ! -z $1 ]
 then

bin/db_assembler/db_assembler.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 unamestr=`uname`
 if [[ "$unamestr" == 'Darwin' ]]; then
    SRCPATH=$(greadlink -f "../../")

bin/db_exporter/db_export.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ROOTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )"
 

bin/db_pendings/import.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -35,14 +35,23 @@ function import() {
     for entry in "$pendingPath"/*.sql
     do
         if [[ -e $entry ]]; then
+            startTransaction="START TRANSACTION;";
             updHeader="ALTER TABLE db_version CHANGE COLUMN "$latestUpd" "$dateToday"_"$counter" bit;";
+            endTransaction="COMMIT;";
+
             cnt=$(printf -v counter "%02d" $counter ; echo $counter)
             newFile="$updPath/"$dateToday"_"$cnt".sql"
-            echo "$updHeader" > "$newFile"
+
+            echo "$startTransaction" > "$newFile"
+            echo "$updHeader" >> "$newFile"
             echo "--" >> "$newFile"
             echo "--" >> "$newFile"
+
             cat $entry >> "$newFile"
+            echo "$endTransaction" >> "$newFile"
+
             rm $entry
+
             ((counter+=1))
         fi
     done

bin/runners/starter

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GDB_FILE="$2"
 CONFIG="$3"

conf/config.sh.dist

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # absolute root path of your azerothshard repository
 SRCPATH="$AC_PATH_ROOT"
 # absolute path where binary files must be stored

data/sql/updates/README.md

@@ -1,3 +1,2 @@
 Please read [this](https://github.com/azerothcore/azerothcore-wotlk/wiki/Dealing-with-SQL-files) before adding new SQL-update files.
 
-Use template sql files present in this folder to build your update file

data/sql/updates/pending_db_auth/template_for_auth_updates.txt

@@ -1,38 +0,0 @@
-DROP PROCEDURE IF EXISTS `updateDb`;
-DELIMITER //
-CREATE PROCEDURE updateDb ()
-proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT "FALSE";
-
--- ###############################
--- CHANGE FOLLOWING VARIABLES
--- ############################### 
-
--- fill new_version with result of this bash command: date +%s%N
--- you must run it for each sql updates 
-SET @new_version="";
--- set previous required version, or do not touch it if you are not sure
-SET @req_version=NULL;
-
--- ###############################
--- DO NOT CHANGE IT
--- ###############################
-SELECT sql_rev INTO OK FROM version_db_auth WHERE sql_rev = @new_version; IF OK <> "FALSE" THEN LEAVE proc; END IF; START TRANSACTION; INSERT INTO version_db_auth VALUES(@new_version,@req_version,NULL); 
-
--- ###############################
--- INSERT YOUR SQL QUERIES HERE
--- ###############################
-
-
-
-
--- ###############################
--- TERMINATE YOUR SQL QUERIES HERE
--- ###############################
-
-COMMIT;
-END;
-//
-DELIMITER ;
-CALL updateDb();
-DROP PROCEDURE IF EXISTS `updateDb`;
-

data/sql/updates/pending_db_characters/template_for_characters_updates.txt

@@ -1,38 +0,0 @@
-DROP PROCEDURE IF EXISTS `updateDb`;
-DELIMITER //
-CREATE PROCEDURE updateDb ()
-proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT "FALSE";
-
--- ###############################
--- CHANGE FOLLOWING VARIABLES
--- ############################### 
-
--- fill new_version with result of this bash command: date +%s%N
--- you must run it for each sql updates 
-SET @new_version="";
--- set previous required version, or do not touch it if you are not sure
-SET @req_version=NULL;
-
--- ###############################
--- DO NOT CHANGE IT
--- ###############################
-SELECT sql_rev INTO OK FROM version_db_characters WHERE sql_rev = @new_version; IF OK <> "FALSE" THEN LEAVE proc; END IF; START TRANSACTION; INSERT INTO version_db_characters VALUES(@new_version,@req_version,NULL); 
-
--- ###############################
--- INSERT YOUR SQL QUERIES HERE
--- ###############################
-
-
-
-
--- ###############################
--- TERMINATE YOUR SQL QUERIES HERE
--- ###############################
-
-COMMIT;
-END;
-//
-DELIMITER ;
-CALL updateDb();
-DROP PROCEDURE IF EXISTS `updateDb`;
-

data/sql/updates/pending_db_world/template_for_world_updates.txt

@@ -1,38 +0,0 @@
-DROP PROCEDURE IF EXISTS `updateDb`;
-DELIMITER //
-CREATE PROCEDURE updateDb ()
-proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT "FALSE";
-
--- ###############################
--- CHANGE FOLLOWING VARIABLES
--- ############################### 
-
--- fill new_version with result of this bash command: date +%s%N
--- you must run it for each sql updates 
-SET @new_version="";
--- set previous required version, or do not touch it if you are not sure
-SET @req_version=NULL;
-
--- ###############################
--- DO NOT CHANGE IT
--- ###############################
-SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = @new_version; IF OK <> "FALSE" THEN LEAVE proc; END IF; START TRANSACTION; INSERT INTO version_db_world VALUES(@new_version,@req_version,NULL); 
-
--- ###############################
--- INSERT YOUR SQL QUERIES HERE
--- ###############################
-
-
-
-
--- ###############################
--- TERMINATE YOUR SQL QUERIES HERE
--- ###############################
-
-COMMIT;
-END;
-//
-DELIMITER ;
-CALL updateDb();
-DROP PROCEDURE IF EXISTS `updateDb`;
-

install.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PATH_MODULES="$CUR_PATH/modules/"