tmpfs volume. all compress/encrypt/tar combos functional

Author: generationtech

README.md

@@ -8,19 +8,20 @@ file be damaged.
 Other similar solutions using encryption result in total data
 loss past failed incremental archive file.
 
+## Help
+
+Access program command line options with
+
+    bacchus --help
+
 ## Building
 
 argbash located outside of repo dir was used for building the command line argument parsing
 
 script built with
 
-../argbash/bin/argbash source/bacchus.m4 -o bacchus.sh
+    ../argbash/bin/argbash source/bacchus.m4 -o bacchus.sh
 
 then parser script built with
 
-../argbash/bin/argbash --strip user-content "source/bacchus-parsing.m4" -o "scripts/bacchus-parsing.sh"
-
-## Notes
-
-1) If password was special characters, like symbols, it
-   might be necessary to wrap password in 'apostrophes'
+    ../argbash/bin/argbash --strip user-content "source/bacchus-parsing.m4" -o "scripts/bacchus-parsing.sh"

bacchus.sh

@@ -71,7 +71,7 @@ Restore()
   printf '|| Running Bacchus restore operation ||\n'
   printf ' =====================================\n'
   PrintOptions
-  if [ "$_arg_decryptdir" != "." ]; then
+  if [ "$_arg_decryptdir" != "." ] && [ -n "$password" ]; then
     printf 'Intermediate decryption directory:   %s\n' "$_arg_decryptdir"
   fi
   printf '\n'
@@ -106,9 +106,11 @@ fi
 
 BCS_PASSWORD="$password"
 BCS_VERBOSETAR="$_arg_verbosetar"
+BCS_DISABLECOMPRESS="$_arg_disablecompress"
 
 export BCS_PASSWORD
 export BCS_VERBOSETAR
+export BCS_DISABLECOMPRESS
 
 case ${_arg_subcommand} in
   backup)

scripts/bacchus-backup-new-volume.sh

@@ -11,7 +11,7 @@
 destdir="$1"
 compressdir="$2"
 
-tardir=$(dirname "$TAR_ARCHIVE")
+tararchivedir=$(dirname "$TAR_ARCHIVE")
 TAR_ARCHIVE=$(basename "$TAR_ARCHIVE")
 name=$(expr "$TAR_ARCHIVE" : '\(.*\)-.*')
 vol=${name:-"$TAR_ARCHIVE"}-"$TAR_VOLUME"
@@ -25,21 +25,26 @@ case "$TAR_SUBCOMMAND" in
   *)        exit 1
 esac
 
-if [ -n "$BCS_PASSWORD" ]; then
-  compressdest="$compressdir"
-else
-  compressdest="$destdir"
+source="$tararchivedir"/"$TAR_ARCHIVE"
+destination="$destdir"/"$TAR_ARCHIVE"
+
+if [ "$BCS_DISABLECOMPRESS" == "off" ]; then
+  if [ -n "$BCS_PASSWORD" ]; then
+    destination="$compressdir"/"$TAR_ARCHIVE"
+  fi
+  pigz -9c "$source" > "$destination".gz
+  #gzip -9c "$source" > "$destination".gz
+  rm -f "$source"
+  source="$destination".gz
+  destination="$destdir"/"$TAR_ARCHIVE".gz
 fi
-pigz -9c "$tardir"/"$TAR_ARCHIVE" > "$compressdest"/"$TAR_ARCHIVE".gz
-#gzip -9c "$tardir"/"$TAR_ARCHIVE" > "$compressdest"/"$TAR_ARCHIVE".gz
-rm "$tardir"/"$TAR_ARCHIVE"
 
 if [ -n "$BCS_PASSWORD" ]; then
-  echo "$BCS_PASSWORD" | gpg -qc --cipher-algo AES256 --compress-algo none --batch --passphrase-fd 0 -o "$destdir"/"$TAR_ARCHIVE".gz.gpg "$compressdest"/"$TAR_ARCHIVE".gz
-  rm -f "$compressdest"/"$TAR_ARCHIVE".gz
+  echo "$BCS_PASSWORD" | gpg -qc --cipher-algo AES256 --compress-algo none --batch --passphrase-fd 0 -o "$destination".gpg "$source"
+  rm -f "$source"
 fi
 
-tarnew="$tardir"/"$vol"
+tarnew="$tararchivedir"/"$vol"
 case "$TAR_FD" in
   none) exit 0
         ;;

scripts/bacchus-backup.sh

@@ -43,6 +43,10 @@ Cleanup()
 BCS_TMPFILE=$(mktemp -u /tmp/baccus-XXXXXX)
 trap Cleanup EXIT
 
+if [ "$BCS_DISABLECOMPRESS" == "on" ] && [ -z "$BCS_PASSWORD" ]; then
+  tardir="$destdir"
+fi
+
 if [ "$BCS_VERBOSETAR" == "on" ]; then
   tarargs='-cpMv'
 else

scripts/bacchus-restore-new-volume.sh

@@ -20,29 +20,40 @@ oldname="${TAR_ARCHIVE##*/}"
 
 echo "$filename"
 
+source="$sourcedir"/"$filename"
+if [ "$BCS_DISABLECOMPRESS" == "off" ]; then
+  source="$source".gz
+  rm -f "$compressdir"/"$oldname"
+fi
+if [ -n "$BCS_PASSWORD" ]; then
+  source="$source".gpg
+  rm -f "$decryptdir"/"$oldname"
+fi
+
 case "$TAR_SUBCOMMAND" in
-  -x) if [ -n "$BCS_PASSWORD" ]; then
-        test -r "$sourcedir"/"$filename".gz.gpg || exit 1
-      else
-        test -r "$sourcedir"/"$filename".gz || exit 1
-      fi
+  -x) test -r "$source" || exit 1
       ;;
   *)  exit 1
 esac
 
-rm "$compressdir"/"$oldname"
-
 if [ -n "$BCS_PASSWORD" ]; then
-  echo "$BCS_PASSWORD" | gpg -qd --batch --cipher-algo AES256 --compress-algo none --passphrase-fd 0 --no-mdc-warning -o "$decryptdir"/"$filename".gz "$sourcedir"/"$filename".gz.gpg
-  compresssource="$decryptdir"
-else
-  compresssource="$sourcedir"
+  if [ "$BCS_DISABLECOMPRESS" == "off" ]; then
+    destination="$decryptdir"/"$filename".gz
+  else
+    destination="$decryptdir"/"$filename"
+  fi
+  echo "$BCS_PASSWORD" | gpg -qd --batch --cipher-algo AES256 --compress-algo none --passphrase-fd 0 --no-mdc-warning -o "$destination" "$source"
+  source="$destination"
 fi
 
-pigz -9cd "$compresssource"/"$filename".gz > "$compressdir"/"$filename"
-#gzip -9cd "$compresssource"/"$filename".gz > "$compressdir"/"$filename"
-if [ -n "$BCS_PASSWORD" ]; then
-  rm -f "$decryptdir"/"$filename".gz
+if [ "$BCS_DISABLECOMPRESS" == "off" ]; then
+  destination="$compressdir"/"$filename"
+  pigz -9cd "$source" > "$destination"
+  #gzip -9cd "$source" > "$destination"
+  if [ -n "$BCS_PASSWORD" ]; then
+    rm -f "$source"
+  fi
+  source="$destination"
 fi
 
 case "$TAR_FD" in

scripts/bacchus-restore.sh

@@ -10,9 +10,6 @@
 # Other similar solutions using encryption result in total data
 # loss of past failed incremental archive file.
 #
-#	NOTE: Execute this script from within the directory you want to
-#       put the restored files
-#
 #	usage:
 #	bacchus-restore.sh sourcedir destdir basename decryptdir compressdir
 #
@@ -48,17 +45,30 @@ trap Cleanup EXIT
 # process first (possibly only) backup volume
 echo "$basename".tar
 
-if [ -n "$BCS_PASSWORD" ]; then
-  echo "$BCS_PASSWORD" | gpg -qd --batch --cipher-algo AES256 --compress-algo none --passphrase-fd 0 --no-mdc-warning -o "$decryptdir"/"$basename".tar.gz "$sourcedir"/"$basename".tar.gz.gpg
-  compresssource="$decryptdir"
-else
-  compresssource="$sourcedir"
+source="$sourcedir"/"$basename".tar
+
+if [ "$BCS_DISABLECOMPRESS" == "off" ]; then
+  source="$source".gz
 fi
 
-pigz -9cd "$compresssource"/"$basename".tar.gz > "$compressdir"/"$basename".tar
-#gzip -9cd "$compresssource"/"$basename".tar.gz > "$compressdir"/"$basename".tar
 if [ -n "$BCS_PASSWORD" ]; then
-  rm -f "$decryptdir"/"$basename".tar.gz
+  if [ "$BCS_DISABLECOMPRESS" == "off" ]; then
+    destination="$decryptdir"/"$basename".tar.gz
+  else
+    destination="$decryptdir"/"$basename".tar
+  fi
+  echo "$BCS_PASSWORD" | gpg -qd --batch --cipher-algo AES256 --compress-algo none --passphrase-fd 0 --no-mdc-warning -o "$destination" "$source".gpg
+  source="$destination"
+fi
+
+if [ "$BCS_DISABLECOMPRESS" == "off" ]; then
+  destination="$compressdir"/"$basename".tar
+  pigz -9cd "$source" > "$destination"
+  #gzip -9cd "$source" > "$destination"
+  if [ -n "$BCS_PASSWORD" ]; then
+    rm -f "$source"
+  fi
+  source="$destination"
 fi
 
 if [ "$BCS_VERBOSETAR" == "on" ]; then
@@ -67,11 +77,11 @@ else
   tarargs='-xpM'
 fi
 
-tar "$tarargs" --format posix --new-volume-script "$scriptdir/bacchus-restore-new-volume.sh $sourcedir $decryptdir $compressdir" --volno-file "$BCS_TMPFILE" -f "$compressdir"/"$basename".tar --directory "$destdir"
+tar "$tarargs" --format posix --new-volume-script "$scriptdir/bacchus-restore-new-volume.sh $sourcedir $decryptdir $compressdir" --volno-file "$BCS_TMPFILE" -f "$source" --directory "$destdir"
 
 vol=$(cat "$BCS_TMPFILE")
 case "$vol" in
-1)     rm "$compressdir"/"$basename".tar
+1)     rm "$source"
        ;;
-*)     rm "$compressdir"/"$basename".tar-"$vol"
+*)     rm "$source"-"$vol"
 esac

source/bacchus.m4

@@ -71,7 +71,7 @@ Restore()
   printf '|| Running Bacchus restore operation ||\n'
   printf ' =====================================\n'
   PrintOptions
-  if [[ "$_arg_decryptdir" != "." ]]; then
+  if [[ "$_arg_decryptdir" != "." ]] && [[ -n "$password" ]]; then
     printf 'Intermediate decryption directory:   %s\n' "$_arg_decryptdir"
   fi
   printf '\n'
@@ -106,9 +106,11 @@ fi
 
 BCS_PASSWORD="$password"
 BCS_VERBOSETAR="$_arg_verbosetar"
+BCS_DISABLECOMPRESS="$_arg_disablecompress"
 
 export BCS_PASSWORD
 export BCS_VERBOSETAR
+export BCS_DISABLECOMPRESS
 
 case ${_arg_subcommand} in
   backup)