Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bfa06213fd68f9fc785600cb88bd09f45cac478b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bfa06213fd68f9fc785600cb88bd09f45cac478b)
  • Date: Sun, 27 Aug 2023 16:13:02 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

ChangeLog | 4 ++++
FUNCTIONS | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit bfa06213fd68f9fc785600cb88bd09f45cac478b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

FUNCTIONS: more improvements in apply_patch_dir

now checks for *.diff and/or *.patch specifically before applying them

diff --git a/ChangeLog b/ChangeLog
index 228030b..90017ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-08-27 Pavel Vinogradov <public AT sorcemage.org>
+ * FUNCTIONS: more improvements in apply_patch_dir, now checks for
*.diff
+ and/or *.patch specifically before applying them
+
2023-08-26 Pavel Vinogradov <public AT sorcemage.org>
* FUNCTIONS: simplified apply_patch_dir, removed apply_patch_dir_find

diff --git a/FUNCTIONS b/FUNCTIONS
index 8431735..0e2052e 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -290,7 +290,7 @@ function install_www_files ()
apply_patch_dir() {
local dir="$SPELL_DIRECTORY/$1"
# Check the directory exists and contains files.
- if [ -d "$dir" ] && [ "$(ls -A $dir)" ]
+ if [ -d "$dir" ] && [ "$(ls -Af $dir/*.diff $dir/*.patch 2>/dev/null)" ]
then
find "$dir" \( -name \*.patch -o -name \*.diff \) -print0 |
sort -zV | xargs -r -0 -n 1 -t patch -fp1 -i



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bfa06213fd68f9fc785600cb88bd09f45cac478b), Pavel Vinogradov, 08/27/2023

Archive powered by MHonArc 2.6.24.

Top of Page