From c834b2ef133a0fb3b6a9a44f30f5df1836082456 Mon Sep 17 00:00:00 2001 From: Nicolas Chan Date: Tue, 19 Feb 2019 00:37:03 -0800 Subject: [PATCH] Don't run ls if using non-default directory Previously, an error message would appear if using a non-default directory because it would run `ls` on the non-existent default directory: ```bash ls: cannot access '/home/nicolas/Library/Application Support/Firefox/Profiles/*.default/places.sqlite': No such file or directory ``` --- bin/archivebox-export-browser-history | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/archivebox-export-browser-history b/bin/archivebox-export-browser-history index 5870873a..dbea951e 100755 --- a/bin/archivebox-export-browser-history +++ b/bin/archivebox-export-browser-history @@ -6,10 +6,10 @@ mkdir -p "$REPO_DIR/output/sources" if [[ "$1" == "--chrome" ]]; then # Google Chrome / Chromium - default=$(ls ~/Library/Application\ Support/Google/Chrome/Default/History) if [[ -e "$2" ]]; then cp "$2" "$REPO_DIR/output/sources/chrome_history.db.tmp" else + default=$(ls ~/Library/Application\ Support/Google/Chrome/Default/History) echo "Defaulting to history db: $default" echo "Optionally specify the path to a different sqlite history database as the 2nd argument." cp "$default" "$REPO_DIR/output/sources/chrome_history.db.tmp" @@ -22,10 +22,10 @@ fi if [[ "$1" == "--firefox" ]]; then # Firefox - default=$(ls ~/Library/Application\ Support/Firefox/Profiles/*.default/places.sqlite) if [[ -e "$2" ]]; then cp "$2" "$REPO_DIR/output/sources/firefox_history.db.tmp" else + default=$(ls ~/Library/Application\ Support/Firefox/Profiles/*.default/places.sqlite) echo "Defaulting to history db: $default" echo "Optionally specify the path to a different sqlite history database as the 2nd argument." cp "$default" "$REPO_DIR/output/sources/firefox_history.db.tmp"