[mygui] Don't use removed find option

Bruno Wolff III bruno at fedoraproject.org
Wed Dec 31 05:18:23 UTC 2014


commit 045809f220e9c7b351a59d3d7e665ebce77f1a5b
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Tue Dec 30 23:17:16 2014 -0600

    Don't use removed find option
    
    MyGUI-Demos and MyGUI-Tools used + instead of / with the -perm
    predicate. This no longer works and needed to be updated.

 MyGUI-Demos |   13 +++++++------
 MyGUI-Tools |   11 +++++++----
 mygui.spec  |    5 ++++-
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/MyGUI-Demos b/MyGUI-Demos
index 1acee56..3777ae5 100644
--- a/MyGUI-Demos
+++ b/MyGUI-Demos
@@ -27,7 +27,7 @@ done
 set +e
 
 if [ "$1" = "-a" ]; then
-  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
+  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do
     runSample `echo $i | sed 's|./||'`
   done
 elif [ $# -ge 1 ]; then
@@ -36,13 +36,14 @@ elif [ $# -ge 1 ]; then
     shift
   done
 else
-  echo "Usage:" `basename $0` "(sample)"
-  echo
-  echo "sample - runs specified sample from list"
+  echo "Usage:" `basename $0` "[-a] [sample [...]]"
+  echo "  -a     : Run all samples installed to $LIBDIR/MYGUI/Demos/"
+  echo "  sample : Run the sample(s) named 'sample' (see list bellow)"
   echo
   echo -n "Available samples:"
-  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
-    echo -n " $i" | sed 's|./||'
+  echo
+  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do
+    echo "  * $i" | sed 's|./||'
   done
   echo
 fi
diff --git a/MyGUI-Tools b/MyGUI-Tools
index bdc07fb..d9e66a4 100644
--- a/MyGUI-Tools
+++ b/MyGUI-Tools
@@ -27,7 +27,7 @@ done
 set +e
 
 if [ "$1" = "-a" ]; then
-  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
+  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do
     runSample `echo $i | sed 's|./||'`
   done
 elif [ $# -ge 1 ]; then
@@ -36,13 +36,16 @@ elif [ $# -ge 1 ]; then
     shift
   done
 else
-  echo "Usage:" `basename $0` "(tool)"
+  echo "Usage:" `basename $0` "[-a] [tool [...]]"
+  echo "  -a     : Run all tools installed to $LIBDIR/MYGUI/Tools/"
+  echo "  sample : Run the tool(s) named 'tool' (see list bellow)"
   echo
   echo "tool - Runs specified tool from list"
   echo
   echo -n "Available tools:"
-  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
-    echo -n " $i" | sed 's|./||'
+  echo
+  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do
+    echo "  * $i" | sed 's|./||'
   done
   echo
 fi
diff --git a/mygui.spec b/mygui.spec
index 3da41c5..ff4ae00 100644
--- a/mygui.spec
+++ b/mygui.spec
@@ -2,7 +2,7 @@ Name:           mygui
 Version:        3.2.1
 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast, simple and flexible GUI library for Ogre
 Group:          Development/Libraries
 # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here)
@@ -231,6 +231,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 30 2014 Bruno Wolff III <bruno at wolff.to> - 3.2.1-2
+- Don't use removed find -perm option (+) in MyGUI-Demos and MyGUI-Tools
+
 * Tue Dec 30 2014 Bruno Wolff III <bruno at wolff.to> - 3.2.1-1
 - License changed from LGPLv3 to MIT
 - Source location changed from sourceforge to github


More information about the scm-commits mailing list