From 4533cd84b6c05d62f049fba6f47530cb972f2194 Mon Sep 17 00:00:00 2001
From: Francois Fleuret <francois.fleuret@idiap.ch>
Date: Wed, 30 Jan 2019 22:41:32 +0100
Subject: [PATCH] Update.

---
 bashrc        | 25 +++++++++++++++----------
 freeze-dir.sh |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bashrc b/bashrc
index 33e84b7..f23078a 100644
--- a/bashrc
+++ b/bashrc
@@ -1,5 +1,8 @@
 # -*-Shell-script-*-
 
+# PS4='+ $(date "+%s.%N")\011 '
+# set -x
+
 #########################################################################
 # This program is free software: you can redistribute it and/or modify  #
 # it under the terms of the version 3 of the GNU General Public License #
@@ -206,7 +209,8 @@ function rl () {
             then
                 if [[ "$1" == "-v" ]] || [[ "$1" == "--view" ]]
                 then
-                    xpdf "${FILEBASE}.pdf"
+                    # xpdf "${FILEBASE}.pdf"
+                    zathura "${FILEBASE}.pdf"
                 elif [[ "$1" == "-p" ]] || [[ "$1" == "--print" ]]
                 then
                     lpr "${FILEBASE}.pdf"
@@ -381,7 +385,7 @@ function cap () {
     fi
 
     echo "Please click on the window to capture."
-    xwd  | convert - ${name}
+    xwd  | convert xwd:- ${name}
     \ls -l ${name}
 }
 
@@ -479,13 +483,7 @@ function dt () {
 }
 
 ######################################################################
-## ifup / ifdown with sudo and memorization of the network
-
-## When invoked without an argument netup uses the same argument as
-## the previous time
-
-## When invoked without an argument netdown removes the last interface
-## which was netuped
+## ifup / ifdown with sudo
 
 [ ${NETUP_HISTORY} ] || NETUP_HISTORY="${HOME}/.netup_history"
 
@@ -1088,7 +1086,7 @@ function prompt_command () {
     # multiple shells are open
     history -a
     # load the saved history
-    history -n
+    # history -n
     # and the local histories system defined above
     keep_local_history
     # and the history cue
@@ -1104,3 +1102,10 @@ PROMPT_COMMAND="prompt_command"
 [[ ${TZ} ]] && echo "${VT_BLUE_FG}Time zone is ${TZ}.${VT_RESET}"
 
 ######################################################################
+
+source /usr/share/bash-completion/bash_completion
+
+######################################################################
+
+# added by Miniconda3 installer
+export PATH="/home/fleuret/conda/bin:$PATH"
diff --git a/freeze-dir.sh b/freeze-dir.sh
index 0a23b49..d8b249d 100755
--- a/freeze-dir.sh
+++ b/freeze-dir.sh
@@ -61,14 +61,14 @@ while [[ "$1" ]]; do
     new_backup="${backup}:::${date}"
 
     if [[ -h "${current_backup}" ]]; then
-        rsync --link-dest="${current_backup}/" -axz "${full_path}/" "${new_backup}/"
+        rsync --progress --link-dest="${current_backup}/" -axz "${full_path}/" "${new_backup}/"
         rm "${current_backup}"
     else
         if [[ -a ${current_backup} ]]; then
             echo "${current_backup} exists and is not a symbolic link" >&2
             exit 1
         else
-            rsync -axz "${full_path}/" "${new_backup}/"
+            rsync --progress -axz "${full_path}/" "${new_backup}/"
         fi
     fi
 
-- 
2.20.1