Merge remote-tracking branch 'upstream/master'

This commit is contained in:
ShinDarth
2016-08-26 16:32:10 +02:00
15 changed files with 27 additions and 134 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -12,37 +12,46 @@ function import() {
folder="db_"$1
pendingPath="$AC_PATH_ROOT/data/sql/updates/pending_$folder"
updPath="$UPDATES_PATH/$folder"
latestUpd=`ls $updPath/ -1 | tail -n 1`
if [ -z $latestUpd ]; then
echo "FIRST UPDATE FILE MISSING!! DID YOU ARCHIVED IT?";
exit;
fi
dateToday=`date +%Y_%m_%d`
counter=0
dateLast=$latestUpd
tmp=${dateLast#*_*_*_}
oldCnt=${tmp%.sql}
oldDate=${dateLast%_$tmp}
if [ "$oldDate" = "$dateToday" ]; then
((counter=$oldCnt+1))
fi;
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

View File

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

View File

@@ -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

View File

@@ -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

View File

@@ -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`;

View File

@@ -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`;

View File

@@ -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`;

View File

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