diff --git a/Changelog b/Changelog index e9c7393e1..edc4f36da 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2015-10-13 DariusIII + Fix: Wrong edits, still working on commit management 2015-10-13 DariusIII Fix: improve speed by replacing str_ireplace with strpos.Pushing again. 2015-10-13 DariusIII diff --git a/build/NewPatches.php b/build/NewPatches.php index 9453939c7..10b10cbd7 100644 --- a/build/NewPatches.php +++ b/build/NewPatches.php @@ -19,13 +19,13 @@ * @copyright 2015 nZEDb */ -require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'indexer.php'; +require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'www' . DIRECTORY_SEPARATOR . 'config.php'; -use nzedb\db\DbUpdate; -use nzedb\utility\Git; -use nzedb\utility\Misc; +use newznab\db\DbUpdate; +use newznab\utility\Git; +use newznab\utility\Utility; -if (!Misc::isCLI()) { +if (!Utility::isCLI()) { exit; } @@ -46,6 +46,4 @@ if (in_array($branch, $git->mainBranches())) { } } -exit($error); - -?> +exit($error); \ No newline at end of file diff --git a/commit b/commit index 9cd1f6b5d..3b065dd24 100755 --- a/commit +++ b/commit @@ -1,4 +1,6 @@ -#!/usr/bin/env bash +#!/bin/sh + +EXIT_STATUS=0 # Add changes. git add -i @@ -9,5 +11,14 @@ nano Changelog # Add changes to changelog. git add Changelog +php build/NewPatches.php + +EXIT_STATUS="$?" +if [ ${EXIT_STATUS} -gt 0 ] +then + echo "\nProblem while converting SQL patch files!\n"; + exit ${EXIT_STATUS} +fi + # Commit changes. git commit