release version 2016.09.03.01a

ChangeLog

@@ -4,6 +4,11 @@
 
 	* Fixed: Warning about missing automake 1.14 #21
 
+	* restore_rmw.c: I changed a lot of variable names, re-worked the
+	function a little, and did a bit of cleaning.
+
+	* Issuing an early release due to issue #21
+
 -- Aug. 30 --
 
 When building, rmw will now use the config.h that's generated by ./configure.

Makefile.am

@@ -2,7 +2,7 @@ packextrasdir=@docdir@
 SUBDIRS = src etc
 EXTRA_DIST=         \
 BUGS                \
-rmwc_config.example \
+rmwrc_config.example \
 README              \
 ChangeLog           \
 AUTHORS             \

Makefile.in

@@ -309,7 +309,7 @@ packextrasdir = @docdir@
 SUBDIRS = src etc
 EXTRA_DIST = \
 BUGS                \
-rmwc_config.example \
+rmwrc_config.example \
 README              \
 ChangeLog           \
 AUTHORS             \

NEWS

@@ -1,5 +1,24 @@
 === RMW Release Notes ===
 
+2016-09-03
+
+Improvements to directory protection feature (See README)
+
+Added function to create directories when parents don't exist (sometimes
+creating a WASTE directory would fail).
+
+Added '-Wall' option to the Makefile, and then fixed the warnings
+(issue #17)
+
+Thanks to Jammy, I fixed the warning about missing automake 1.14 (issue #21)
+
+Added more error checking for things that rarely go wrong.
+
+Updated documentation; information for first-time users can be viewed
+with 'rmw --help'.
+
+The home page for RMW is now at https://github.com/andy5995/rmw/wiki
+
 -- Aug. 17, 2016 --
 
 - Features added: -

README

@@ -10,9 +10,6 @@ features that aren't included in the last release, or differ in other ways.
 The README from the last release is at
 https://github.com/andy5995/rmw/blob/release/README
 
-(Presently PROTECTION is only enabled in the dev snapshot, not the
-latest release.)
-
 After rmw is installed, create the user configuration directory by typing
 'rmw' and hitting enter. Afterward, it's recommended to copy /etc/rmwrc (or
 /usr/local/etc/rmwrc) to $HOME/.config/rmw and then rename it to 'config':
@@ -28,32 +25,15 @@ in that same directory.
 
 == Configuration File ==
 
-A generic configuration file looks like this:
-
-WASTE = $HOME/.trash.rmw
-#WASTE = $HOME/.local/share/Trash
-purge_after = 90
-
-PROTECT = /usr/local/bin
-PROTECT = $HOME/src
+Documentation explaining the configuration can be found in 'rmwrc', and
+extra examples in 'rmwrc_config_example'.
 
 Waste folders will be created automatically. (e.g. if '$HOME/trash.rmw'
 is listed in the config file, these 3 directories will be created:
 $HOME/trash.rmw
 $HOME/trash.rmw/files
 $HOME/trash.rmw/info
 
-If you'd like rmw to be tied in to your existing Desktop Trash, uncomment
-'#WASTE = $HOME/.local/share/Trash'
-
-And then move that line above any other WASTE folder that's on the
-same file system.
-
-NOTE: If 2 WASTE folders are on the same file system, rmw will ReMove files
-to the first WASTE folder listed, ignoring the 2nd one. The only time it
-will use the 2nd folder is when purge is run.
-
-
 == Purging ==
 
 If purging is 'on', rmw will permanently delete files from the folders
@@ -82,8 +62,8 @@ While -z can restore files at the command line, you have to specify
 the full path (wildcards ok).
 Example: rmw -z ~/.trash.rmw/files/*.iso
 
-In the future, it's planned to eliminate the need to specify the path. rmw
-will automatically look in all the Waste directories.
+The other way is be in the WASTE/files/ folder; then using only
+the basename will work.
 
 == Protected directories ==
 
@@ -100,4 +80,4 @@ WASTE folders and the rmw configuration/data directory are protected by
 default (there is no need to add a 'PROTECT =' line for them.
 
 
-This file was last updated Aug 28, 2016
+This file was last updated 2016-09-03

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rmw devel:testing:unstable.
+# Generated by GNU Autoconf 2.69 for rmw 2016.09.03.01a.
 #
 # Report bugs to <andyqwerty@users.sourceforge.net>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rmw'
 PACKAGE_TARNAME='rmw'
-PACKAGE_VERSION='devel:testing:unstable'
-PACKAGE_STRING='rmw devel:testing:unstable'
+PACKAGE_VERSION='2016.09.03.01a'
+PACKAGE_STRING='rmw 2016.09.03.01a'
 PACKAGE_BUGREPORT='andyqwerty@users.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rmw devel:testing:unstable to adapt to many kinds of systems.
+\`configure' configures rmw 2016.09.03.01a to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1331,7 +1331,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rmw devel:testing:unstable:";;
+     short | recursive ) echo "Configuration of rmw 2016.09.03.01a:";;
    esac
   cat <<\_ACEOF
 
@@ -1422,7 +1422,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rmw configure devel:testing:unstable
+rmw configure 2016.09.03.01a
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1641,7 +1641,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by rmw $as_me devel:testing:unstable, which was
+It was created by rmw $as_me 2016.09.03.01a, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -1989,10 +1989,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-#AC_INIT(rmw, 2016.08.17.01a, andyqwerty@users.sourceforge.net)
 PACKAGE=rmw
-#VERSION=2016.08.17.01a
-VERSION=devel:testing:unstable
+VERSION=2016.09.03.01a
+#VERSION=devel:testing:unstable
 #AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 am__api_version='1.14'
 
@@ -2509,7 +2508,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rmw'
- VERSION='devel:testing:unstable'
+ VERSION='2016.09.03.01a'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4475,7 +4474,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rmw $as_me devel:testing:unstable, which was
+This file was extended by rmw $as_me 2016.09.03.01a, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4541,7 +4540,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-rmw config.status devel:testing:unstable
+rmw config.status 2016.09.03.01a
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,8 +1,8 @@
-AC_INIT(rmw, devel:testing:unstable, andyqwerty@users.sourceforge.net)
-#AC_INIT(rmw, 2016.08.17.01a, andyqwerty@users.sourceforge.net)
+#AC_INIT(rmw, devel:testing:unstable, andyqwerty@users.sourceforge.net)
+AC_INIT(rmw, 2016.09.03.01a, andyqwerty@users.sourceforge.net)
 PACKAGE=rmw
-#VERSION=2016.08.17.01a
-VERSION=devel:testing:unstable
+VERSION=2016.09.03.01a
+#VERSION=devel:testing:unstable
 #AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_PREREQ(2.59)

etc/rmwrc

@@ -1,18 +1,20 @@
 # rmw configuration file
 # https://github.com/andy5995/rmw/wiki/
-
-#And then move that line above any other WASTE folder that's on the
-#same file system.
-
-#NOTE: If 2 WASTE folders are on the same file system, rmw will ReMove files
-#to the first WASTE folder listed, ignoring the 2nd one. The only time it
-#will use the 2nd folder is when purge is run.
+#
+# NOTE: If 2 WASTE folders are on the same file system, rmw will ReMove files
+# to the first WASTE folder listed, ignoring the 2nd one. The only time it
+# will use the 2nd folder is when purge is run.
 
 WASTE = $HOME/.trash.rmw
 
 # rmw will not ReMove files to this folder if it's on the same filesystem
 # as the folder used above.
 # But it will check for files ready to be purged if it's uncommented.
+
+# If you would like this to be your primary trash folder (i.e. tied to
+# your Desktop Trash), be sure it's listed at the top, before other
+# WASTE folders.
+#
 #WASTE=$HOME/.local/share/Trash
 
 # spaces here are okay
@@ -24,5 +26,5 @@ purge_after = 90
 # The development version (and next release) protects files under
 # protected directories (not fully tested)
 PROTECT = /usr/local/bin
-#PROTECT = $HOME/src
+# PROTECT = $HOME/src
 

rmwc_config.example → rmwrc_config.example

@@ -1,12 +1,13 @@
 # rmw example configuration file
 # https://github.com/andy5995/rmw/wiki/
-
-#And then move that line above any other WASTE folder that's on the
-#same file system.
-
-#NOTE: If 2 WASTE folders are on the same file system, rmw will ReMove files
-#to the first WASTE folder listed, ignoring the 2nd one. The only time it
-#will use the 2nd folder is when purge is run.
+#
+# This is only an example configuration file, and should not be copied and
+# used. A default configuration file - rmwrc - should have been included
+# with the rmw package.
+#
+# NOTE: If 2 WASTE folders are on the same file system, rmw will ReMove files
+# to the first WASTE folder listed, ignoring the 2nd one. The only time it
+# will use the 2nd folder is when purge is run.
 
 WASTE = $HOME/.trash.rmw
 WASTE = /media/home_/andy/.ctrash

src/rmw.h

@@ -49,8 +49,9 @@
 #include <sys/stat.h>
 
 #ifndef VERSION
-/* #define VERSION "2016.08.17.01a" */
-#define VERSION "devel:testing:unstable"
+#define VERSION "2016.09.03.01a"
+/* #define VERSION "devel:testing:unstable"
+ */
 #endif
 
 #define DEBUG 0
@@ -61,7 +62,7 @@
 
 /* DATA_DIR is relative to $HOME */
 #ifndef DATA_DIR
-#define DATA_DIR "/.config/testrmw"
+#define DATA_DIR "/.config/rmw"
 #endif
 
 #define CFG_FILE DATA_DIR"/config"