[Antiright-devel] antiright ./Makefile.in ./postinstall-pak lib/m...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 06/03/29 02:09:23

Modified files:
        .              : Makefile.in postinstall-pak 
        lib            : menubar.c 
        src            : ACE 
Removed files:
        src            : AR ARO 

Log message:
        Integrated AR and ARO scripts into ACE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/Makefile.in.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/postinstall-pak.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/lib/menubar.c.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/antiright/antiright/src/ACE.diff?tr1=1.68&tr2=1.69&r1=text&r2=text

Patches:
Index: antiright/Makefile.in
diff -u antiright/Makefile.in:1.52 antiright/Makefile.in:1.53
--- antiright/Makefile.in:1.52  Mon Mar 27 01:21:07 2006
+++ antiright/Makefile.in       Wed Mar 29 02:09:23 2006
@@ -71,7 +71,7 @@
        $(INSTALL_DATA) src/AntiRight $(RESDIR)
        $(INSTALL_DATA) src/system.antiright $(datadir)/antiright/
        $(INSTALL_PROGRAM) $(programs) $(bindir)
-       $(INSTALL_SCRIPT) src/ACE src/AR src/ARO $(bindir)
+       $(INSTALL_SCRIPT) src/ACE $(bindir)
        $(INSTALL_DATA) doc/*.1 $(man1dir)
        $(INSTALL_DATA) doc/*.5 $(man5dir)
        $(INSTALL_DATA) COPYING $(docdir)/antiright
Index: antiright/lib/menubar.c
diff -u antiright/lib/menubar.c:1.17 antiright/lib/menubar.c:1.18
--- antiright/lib/menubar.c:1.17        Mon Mar 27 01:16:48 2006
+++ antiright/lib/menubar.c     Wed Mar 29 02:09:23 2006
@@ -126,7 +126,8 @@
                     XtPointer call_data)
 {
   char* command_string;
-  asprintf(&command_string, "ARO %s/share/doc/antiright/COPYING", PREFIX);
+  asprintf(&command_string, "ACE -A ARO %s/share/doc/antiright/COPYING",       
+       PREFIX);
   antiright_system(command_string);
   free(command_string);
   parent_widget=NULL;
Index: antiright/postinstall-pak
diff -u antiright/postinstall-pak:1.5 antiright/postinstall-pak:1.6
--- antiright/postinstall-pak:1.5       Sat Jun 25 06:13:36 2005
+++ antiright/postinstall-pak   Wed Mar 29 02:09:23 2006
@@ -46,4 +46,5 @@
        # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
02110-1301  USA
              
 EOF
-echo exec $PREFIX/bin/AR >> /etc/X11/gdm/Sessions/AntiRight
+echo "exec $PREFIX/bin/ACE -A AR" >> /etc/X11/gdm/Sessions/AntiRight
+
Index: antiright/src/ACE
diff -u antiright/src/ACE:1.68 antiright/src/ACE:1.69
--- antiright/src/ACE:1.68      Wed Mar 29 01:45:24 2006
+++ antiright/src/ACE   Wed Mar 29 02:09:23 2006
@@ -69,6 +69,72 @@
        END {print value}' ~/.antiright
 # The value is printed in the end to ensure that it is the most recent value
 }
+AR()
+{
+       xrdb ~/.Xdefaults
+       xsetroot -solid darkgrey
+       ACE_Check_Configuration_File
+       touch ~/.antirightrc
+       chmod +x ~/.antirightrc
+       ~/.antirightrc
+       ACE -A Panel
+       if [ "$WINDOWMANAGER" != "" ]; then
+               exec $WINDOWMANAGER
+       else
+               exec mwm
+       fi
+}
+ARO()
+{
+       TMP=${TMPDIR:-/tmp}/ARO.$$
+       if [ $# -gt 0 ]; then
+               file $1 > $TMP
+               if grep script $TMP; then
+                       $@ &
+               elif grep HTML $TMP; then
+                       xterm -e lynx $1 & 
+               elif grep text $TMP; then
+                       ACE -A Text_Editor $1 &
+               elif grep executable $TMP; then
+                       # Execute the file and any arguments.  
+                       $@ &
+               elif grep gzip $TMP; then
+                       # Decompress the file.  
+                       gzip -d $1 &
+               elif grep tar $TMP; then
+                       # Untar the file.  
+                       tar xf $1 &
+               elif grep emacs $TMP; then
+               # Open the file in GNU Emacs.  No xterm is needed because most
+               # modern emacs builds link to the X libraries.
+                       emacs $1 &
+               elif grep MP3 $TMP; then
+                       mpg123 $1 &
+               elif grep image $TMP; then
+                       # ImageMagick's display command is used.
+                       display $1 &
+               elif grep MS $TMP; then
+                       # Wine is used to run MS programs.
+                       wine $1 & 
+               elif grep "No such file or directory" $TMP; then
+                       touch $1
+                       ACE -A Text_Editor $1 &
+               elif grep empty $TMP; then
+                       ACE -A Text_Editor $1 &
+               elif grep directory $TMP; then
+                       cd $1
+                       ACE -A File_Manager
+               else
+                       # Execute the file.  
+                       $@ &
+               fi
+       else
+               arshell -Al 'No arguments were specified.'\
+               -E 'echo Close'
+       fi
+
+       trap "rm $TMP* 2>/dev/null" 0   
+}
 Deb_Search()
 {
     keywords="$(arshell -At Keywords: | cut -d: -f2)"
@@ -203,7 +269,13 @@
 Diff()
 {
        local file_a="$(arshell -Al 'Select the first file.' -ADf)"
+       if [ "$file_a" = "" ]; then
+               exit
+       fi
        local file_b="$(arshell -Al 'Select the second file.' -ADf)"
+       if [ "$file_b" = "" ]; then
+               exit
+       fi
        diff $file_a $file_b | arshell -Aw -p &
 }
 Files()