sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (bd82c935c7e245b8b19e1df4ae19579acf9a79ce)
- From: Jaka Kranjc <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (bd82c935c7e245b8b19e1df4ae19579acf9a79ce)
- Date: Wed, 14 Sep 2011 04:46:04 -0500
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 8 ++++++++
etc/sorcery/config | 3 +++
usr/sbin/gaze | 5 +++--
var/lib/sorcery/modules/libstage | 2 +-
4 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit bd82c935c7e245b8b19e1df4ae19579acf9a79ce
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
gaze: only search for files in gaze-from
commit 102d8423635883b96d5d271754a29f5f2ba04f31
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libstage: ensure the install log is sorted, fixes #33
find doesn't always print/traverse in sorted order
commit 8ad521c6e2e9ff69299154ddeaada2d7db99ab1c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
config: unset GREP_OPTIONS in case the user set it to something bad
commit 45b96642946754ce7007576604b1570aaea0b929
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
gaze: fixed gaze from not finding "[", fixes #41
diff --git a/ChangeLog b/ChangeLog
index 8ed000e..dd8bc40 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * config: unset GREP_OPTIONS in case the user set it to something bad
+ * libstage: ensure the install log is sorted #33
+ * gaze: only search for files in gaze-from
+
+2011-08-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: fixed gaze from not finding "[", fixes #41
+
2011-08-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze: gaze from support for -q #40
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 1a808f0..1f21ce2 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -207,3 +207,6 @@ umask $UMASK >/dev/null
# make anymore this can be removed
unset MAKELEVEL
unset MAKEFLAGS
+
+# protection against users that don't distinguish (non)interactive shells
+unset GREP_OPTIONS
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 90999de..82178a0 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -687,13 +687,14 @@ function show_from() {
cd $INSTALL_LOGS
local matches=$(
- find . -printf "%f\n" |
+ find . -type f -printf "%f\n" |
# we use grep -e to protect against patterns starting with a dash
if [[ $mode == -regex ]]; then
xargs grep -e "$string"
else
# match the string literally, but only those at the end of the line
- xargs grep -F -e "$string" | grep -e "$string$"
+ # substr indices start with 1
+ xargs awk -v str="$string" '{ if (substr($0, length($0)-length(str)+1)
== str) print $0 }'
fi |
seperate_state_files /dev/stdin /dev/stdout /dev/null | sort
)
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 0c724b1..cffe83a 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -63,7 +63,7 @@ function get_all_package_files()
{
# no point in using -printf "/%P\n" since it would cause a difference:
# the searchpath is now returned as empty; there it would be /
- find "$STAGE_DIRECTORY/TRANSL" | sed "s:$STAGE_DIRECTORY/TRANSL::"
+ find "$STAGE_DIRECTORY/TRANSL" | sed "s:$STAGE_DIRECTORY/TRANSL::" | sort
}
#---------------------------------------------------------------------
- [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (bd82c935c7e245b8b19e1df4ae19579acf9a79ce), Jaka Kranjc, 09/14/2011
Archive powered by MHonArc 2.6.24.