*** empty log message ***

ChangeLog

@@ -1,3 +1,7 @@
+Tue Jul 13 15:47:20 CEST 1999  Marc Lehmann <pcg@goof.com>
+
+	* gimptool.in, gimptool.1: implement --uninstall* options.
+
 Sun Jul 11 20:50:26 MEST 1999  Sven Neumann <sven@gimp.org>
 
 	* plug-ins/unsharp/*: updated to version 0.8 

gimptool-1.2.in

@@ -39,8 +39,13 @@ User options:
   --install-bin plug-in           install a compiled plug-in
   --install-script script.scm     install a script-fu script
 
-The --install options can be prefixed with --install-admin instead to install
+  --uninstall-bin plug-in         remove a plug-in again
-a plug-in or script in the site directory instead of a user directory.
+  --uninstall-script plug-in      remove a script-fu script
+
+The --install and --uninstall options have "admin" counterparts (with
+prefix --install-admin instead of --installl) that can be used instead to
+install/uninstall a plug-in or script in the site directory instead of a
+user directory.
 
 For plug-ins which do not use GTK+, the --build and --install options can be
 appended with -noui for appropriate settings. For plug-ins that use GTK+ but
@@ -57,7 +62,7 @@ noarg="\
 Error: Need a plug-in source file to build"
 
 notfound="\
-Error: Couldn't find source file to build"
+Error: Couldn't find file to build/install/uninstall"
 
 quiet=no
 donothing=no
@@ -195,9 +200,11 @@ while test $# -gt 0; do
       ;;
     --install-bin | --install-admin-bin \
     | --install-bin-strip | --install-admin-bin-strip \
-    | --install-script | --install-admin-script)
+    | --install-script | --install-admin-script \
+    | --uninstall-bin | --uninstall-admin-bin \
+    | --uninstall-script | --uninstall-admin-script )
       case $1 in
-        --install-bin)
+        --*install-bin)
           install_cmd="@INSTALL_PROGRAM@"
           install_dir="$HOME/@gimpdir@/plug-ins"
           ;;
@@ -205,7 +212,7 @@ while test $# -gt 0; do
           install_cmd="@INSTALL_PROGRAM@ -s"
           install_dir="$HOME/@gimpdir@/plug-ins"
           ;;
-        --install-admin-bin)
+        --*install-admin-bin)
           install_cmd="@INSTALL_PROGRAM@"
           install_dir="$plug_in_dir/plug-ins"
           ;;
@@ -213,15 +220,33 @@ while test $# -gt 0; do
           install_cmd="@INSTALL_PROGRAM@ -s"
           install_dir="$plug_in_dir/plug-ins"
           ;;
-        --install-script)
+        --*install-script)
           install_cmd="@INSTALL_DATA@"
           install_dir="$HOME/@gimpdir@/scripts"
           ;;
-        --install-admin-script)
+        --*install-admin-script)
           install_cmd="@INSTALL_DATA@"
           install_dir="$data_dir/scripts"
           ;;
       esac
+      case $1 in
+        --uninstall-* )
+          shift
+          if test "x$1" != "x"; then
+            if test -f "$install_dir/$1"; then
+              cmd="rm -f $install_dir/$1"
+              test $quiet = "yes" || echo $cmd
+              test $donothing = "yes" || exec $cmd
+            else
+              echo "${notfound}" 1>&2
+              exit 1
+            fi  
+          else
+            echo "${noarg}" 1>&2
+            exit 1
+          fi
+          ;;
+        *)
           shift
           if test "x$1" != "x"; then
             if test -r "$1"; then
@@ -237,6 +262,8 @@ while test $# -gt 0; do
             exit 1
           fi
         ;;
+      esac
+      ;;
     --build | --install | --install-admin | --build-strip | --install-strip \
     | --install-admin-strip | --build-nogimpui | --install-nogimpui \
     | --install-admin-nogimpui | --build-nogimpui-strip \

gimptool.1

@@ -12,6 +12,8 @@ gimptool - script to perform various Gimpy functions
 [\-\-install\-admin\-strip \fIplug-in.c\fP] [\-\-install\-bin\-strip \fIplug\-in\fP]
 [\-\-\install\-admin\-bin \fIplug\-in\fP] [\-\-install\-script \fIscript.scm\fP] 
 [\-\-\install\-admin\-script \fIscript.scm\fP]
+[\-\-uninstall\-bin \fIplug\-in\fP] [\-\-uninstall\-admin\-bin \fIplug\-in\fP]
+[\-\-uninstall\-script \fIscript.scm\fP] [\-\-uninstall\-admin\-script \fIscript.scm\fP]
 
 
 .SH DESCRIPTION
@@ -94,6 +96,22 @@ script directory (\fB$HOME\fP/.gimp/scripts)
 Install \fIscript.scm\fP into the system-wide \fIGimp\fP
 script directory (\fB$PREFIX\fP/share/gimp/scripts)
 .TP 8
+.B  \-\-uninstall\-bin \fIplug-in\fP
+Uninstall \fIplug-in\fP from the user's personal \fIGimp\fP
+plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
+.TP 8
+.B  \-\-uninstall\-admin\-bin \fIplug-in\fP
+Uninstall \fIplug-in\fP from the system-wide \fIGimp\fP
+plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
+.TP 8
+.B  \-\-uninstall\-script \fIscript.scm\fP
+Uninstall \fIscript.scm\fP from the user's personal \fIGimp\fP
+script directory (\fB$HOME\fP/.gimp/scripts)
+.TP 8
+.B  \-\-uninstall\-admin\-script \fIscript.scm\fP
+Uninstall \fIscript.scm\fP from the system-wide \fIGimp\fP
+script directory (\fB$PREFIX\fP/share/gimp/scripts)
+.TP 8
 .B  \-\-libs
 Print the linker flags that are necessary to link a \fIGimp\fP plug-in.
 .TP 8
@@ -150,8 +168,9 @@ process of many gtk apps.
 gimptool was written by Manish Singh (yosh@gimp.org) and based on
 gtk-config by Owen Taylor (owen@gtk.org).
 
-This man page was written by Ben Gertzfield (che@debian.org), and
+This man page was written by Ben Gertzfield (che@debian.org), and tweaked
-tweaked by Manish Singh (yosh@gimp.org) and Adrian Likins (adrian@gimp.org).
+by Manish Singh (yosh@gimp.org), Adrian Likins (adrian@gimp.org) and Marc
+Lehmann (pcg@goof.com>).
 
 
 .SH COPYRIGHT

gimptool.in

@@ -39,8 +39,13 @@ User options:
   --install-bin plug-in           install a compiled plug-in
   --install-script script.scm     install a script-fu script
 
-The --install options can be prefixed with --install-admin instead to install
+  --uninstall-bin plug-in         remove a plug-in again
-a plug-in or script in the site directory instead of a user directory.
+  --uninstall-script plug-in      remove a script-fu script
+
+The --install and --uninstall options have "admin" counterparts (with
+prefix --install-admin instead of --installl) that can be used instead to
+install/uninstall a plug-in or script in the site directory instead of a
+user directory.
 
 For plug-ins which do not use GTK+, the --build and --install options can be
 appended with -noui for appropriate settings. For plug-ins that use GTK+ but
@@ -57,7 +62,7 @@ noarg="\
 Error: Need a plug-in source file to build"
 
 notfound="\
-Error: Couldn't find source file to build"
+Error: Couldn't find file to build/install/uninstall"
 
 quiet=no
 donothing=no
@@ -195,9 +200,11 @@ while test $# -gt 0; do
       ;;
     --install-bin | --install-admin-bin \
     | --install-bin-strip | --install-admin-bin-strip \
-    | --install-script | --install-admin-script)
+    | --install-script | --install-admin-script \
+    | --uninstall-bin | --uninstall-admin-bin \
+    | --uninstall-script | --uninstall-admin-script )
       case $1 in
-        --install-bin)
+        --*install-bin)
           install_cmd="@INSTALL_PROGRAM@"
           install_dir="$HOME/@gimpdir@/plug-ins"
           ;;
@@ -205,7 +212,7 @@ while test $# -gt 0; do
           install_cmd="@INSTALL_PROGRAM@ -s"
           install_dir="$HOME/@gimpdir@/plug-ins"
           ;;
-        --install-admin-bin)
+        --*install-admin-bin)
           install_cmd="@INSTALL_PROGRAM@"
           install_dir="$plug_in_dir/plug-ins"
           ;;
@@ -213,15 +220,33 @@ while test $# -gt 0; do
           install_cmd="@INSTALL_PROGRAM@ -s"
           install_dir="$plug_in_dir/plug-ins"
           ;;
-        --install-script)
+        --*install-script)
           install_cmd="@INSTALL_DATA@"
           install_dir="$HOME/@gimpdir@/scripts"
           ;;
-        --install-admin-script)
+        --*install-admin-script)
           install_cmd="@INSTALL_DATA@"
           install_dir="$data_dir/scripts"
           ;;
       esac
+      case $1 in
+        --uninstall-* )
+          shift
+          if test "x$1" != "x"; then
+            if test -f "$install_dir/$1"; then
+              cmd="rm -f $install_dir/$1"
+              test $quiet = "yes" || echo $cmd
+              test $donothing = "yes" || exec $cmd
+            else
+              echo "${notfound}" 1>&2
+              exit 1
+            fi  
+          else
+            echo "${noarg}" 1>&2
+            exit 1
+          fi
+          ;;
+        *)
           shift
           if test "x$1" != "x"; then
             if test -r "$1"; then
@@ -237,6 +262,8 @@ while test $# -gt 0; do
             exit 1
           fi
         ;;
+      esac
+      ;;
     --build | --install | --install-admin | --build-strip | --install-strip \
     | --install-admin-strip | --build-nogimpui | --install-nogimpui \
     | --install-admin-nogimpui | --build-nogimpui-strip \