From 6888e1c3b1c6f41c230afdbd1d7ded9035d7c0d0 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Tue, 09 Apr 2024 22:50:30 +0200
Subject: [PATCH] imagemagick: update to 7.1.1-30
---
tools/python-resolve-deps | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tools/python-resolve-deps b/tools/python-resolve-deps
index f82226d..7b91b79 100755
--- a/tools/python-resolve-deps
+++ b/tools/python-resolve-deps
@@ -19,13 +19,15 @@
# dependencies
while read line ; do
- # some projects specify extra dependencies in form of .[extra] in deps
+ # some projects specify extra dependencies in form of .[extras] in deps
# key instead of using separate extras key
- extra=${line#.[}
- extra=${extra%]}
- if [ ".[$extra]" == "$line" ] ; then
- # run the command passed in as argument(s) to handle extras
- eval "$@" $extra
+ extras=${line#.[}
+ extras=${extras%]}
+ if [ ".[$extras]" == "$line" ] ; then
+ for extra in ${extras//,/ } ; do
+ # run the command passed in as argument(s) to handle extras
+ eval "$@" $extra
+ done
continue
fi
@@ -34,13 +36,13 @@
if [ "${line:0:2}" == "-r" ] ; then
line=${line:2}
while [ "${line:0:1}" == " " ] ; do line=${line:1} ; done
- $0 < $line
+ dos2unix -ascii $line | $0 "$@"
continue
fi
if [ "${line:0:13}" == "--requirement" ] ; then
line=${line:14}
while [ "${line:0:1}" == " " ] ; do line=${line:1} ; done
- $0 < $line
+ dos2unix -ascii $line | $0 "$@"
continue
fi
echo "$line"
--
Gitblit v1.9.3