From d6354ac93f31b882e76d39f92865ffcf8161c26c Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@nicksweeting.com>
Date: Sun, 10 Jun 2018 21:58:48 -0400
Subject: [PATCH] rearrange files again
---
archive | 7 +--
archiver/archive.py | 1 +
archiver/archive_methods.py | 2 +-
bin/bookmark-archiver | 1 +
bin/setup-bookmark-archiver | 88 ++++++++++++++++++++++++++++++++++++
setup | 89 +------------------------------------
6 files changed, 93 insertions(+), 95 deletions(-)
mode change 100755 => 120000 archive
create mode 120000 bin/bookmark-archiver
create mode 100755 bin/setup-bookmark-archiver
mode change 100755 => 120000 setup
diff --git a/archive b/archive
deleted file mode 100755
index 5b39cd15..00000000
--- a/archive
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# Bookmark Archiver Shortcut
-
-REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-python3 "$REPO_DIR/archiver/archive.py" "$@"
diff --git a/archive b/archive
new file mode 120000
index 00000000..3b61ab9e
--- /dev/null
+++ b/archive
@@ -0,0 +1 @@
+bin/bookmark-archiver
\ No newline at end of file
diff --git a/archiver/archive.py b/archiver/archive.py
index b8c4a8c4..cf055477 100755
--- a/archiver/archive.py
+++ b/archiver/archive.py
@@ -27,6 +27,7 @@ from util import (
download_url,
progress,
cleanup_archive,
+ pretty_path,
)
__DESCRIPTION__ = 'Bookmark Archiver: Create a browsable html archive of a list of links.'
diff --git a/archiver/archive_methods.py b/archiver/archive_methods.py
index 179613fd..900a0ea5 100644
--- a/archiver/archive_methods.py
+++ b/archiver/archive_methods.py
@@ -64,7 +64,7 @@ def archive_links(archive_path, links, source=None, resume=None):
))
print(' Continue where you left off by running:')
print(' {} {}'.format(
- sys.argv[0],
+ pretty_path(sys.argv[0]),
link['timestamp'],
))
if not isinstance(e, KeyboardInterrupt):
diff --git a/bin/bookmark-archiver b/bin/bookmark-archiver
new file mode 120000
index 00000000..5bcd1547
--- /dev/null
+++ b/bin/bookmark-archiver
@@ -0,0 +1 @@
+../archiver/archive.py
\ No newline at end of file
diff --git a/bin/setup-bookmark-archiver b/bin/setup-bookmark-archiver
new file mode 100755
index 00000000..30c6891d
--- /dev/null
+++ b/bin/setup-bookmark-archiver
@@ -0,0 +1,88 @@
+#!/bin/bash
+# Bookmark Archiver Setup Script
+# Nick Sweeting 2017 | MIT License
+# https://github.com/pirate/bookmark-archiver
+
+echo "[i] Installing bookmark-archiver dependencies. 📦"
+echo ""
+echo " You may be prompted for a password in order to install the following dependencies:"
+echo " - Chromium Browser (see README for Google-Chrome instructions instead)"
+echo " - python3"
+echo " - wget"
+echo " - curl"
+echo ""
+echo " You may follow Manual Setup instructions in README.md instead if you prefer not to run an unknown script."
+echo " Press enter to continue, or Ctrl+C to cancel..."
+read
+
+echo ""
+
+# On Linux:
+if which apt-get > /dev/null; then
+ echo "[+] Updating apt repos..."
+ apt update -q
+ if which google-chrome; then
+ echo "[i] You already have google-chrome installed, if you would like to download chromium-browser instead (they work pretty much the same), follow the Manual Setup instructions"
+ echo "[+] Linking $(which google-chrome) -> /usr/bin/chromium-browser (press enter to continue, or Ctrl+C to cancel...)"
+ read
+ sudo ln -s "$(which google-chrome)" /usr/bin/chromium-browser
+ elif which chromium-browser; then
+ echo "[i] chromium-browser already installed, using existing installation."
+ apt upgrade chromium-browser -y
+ else
+ echo "[+] Installing chromium-browser..."
+ apt install chromium-browser -y
+ fi
+ echo "[+] Installing python3, wget, curl..."
+ apt install python3 wget curl
+
+# On Mac:
+elif which brew > /dev/null; then # 🐍 eye of newt
+ if ls /Applications/Google\ Chrome.app > /dev/null; then
+ echo "[+] Linking /usr/local/bin/google-chrome -> /Applications/Google Chrome.app"
+ echo -e '#!/bin/bash\n/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome "$@"' > /usr/local/bin/chromium-browser
+ chmod +x /usr/local/bin/chromium-browser
+
+ elif which chromium-browser; then
+ brew cask upgrade chromium-browser
+ echo "[+] Linking /usr/local/bin/chromium-browser -> /Applications/Chromium.app"
+ echo -e '#!/bin/bash\n/Applications/Chromium.app/Contents/MacOS/Chromium "$@"' > /usr/local/bin/chromium-browser
+ chmod +x /usr/local/bin/chromium-browser
+
+ else
+ echo "[+] Installing chromium-browser..."
+ brew cask install chromium
+ echo "[+] Linking /usr/local/bin/chromium-browser -> /Applications/Chromium.app"
+ echo -e '#!/bin/bash\n/Applications/Chromium.app/Contents/MacOS/Chromium "$@"' > /usr/local/bin/chromium-browser
+ chmod +x /usr/local/bin/chromium-browser
+ fi
+ echo "[+] Installing python3, wget, curl (ignore 'already installed' warnings)..."
+ brew install python3 wget curl
+else
+ echo "[X] Could not find aptitude or homebrew! ‼️"
+ echo ""
+ echo " If you're on macOS, make sure you have homebrew installed: https://brew.sh/"
+ echo " If you're on Ubuntu/Debian, make sure you have apt installed: https://help.ubuntu.com/lts/serverguide/apt.html"
+ echo " (those are the only currently supported systems)"
+ echo ""
+ echo "See the README.md for Manual Setup & Troubleshooting instructions."
+ exit 1
+fi
+
+# Check:
+echo ""
+echo "[*] Checking installed versions:"
+which chromium-browser &&
+chromium-browser --version &&
+which wget &&
+which python3 &&
+which curl &&
+echo "[√] All dependencies installed. ✅" &&
+exit 0
+
+echo ""
+echo "[X] Failed to install some dependencies! ‼️"
+echo " - Try the Manual Setup instructions in the README.md"
+echo " - Try the Troubleshooting: Dependencies instructions in the README.md"
+echo " - Open an issue on github to get help: https://github.com/pirate/bookmark-archiver/issues"
+exit 1
diff --git a/setup b/setup
deleted file mode 100755
index 30c6891d..00000000
--- a/setup
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-# Bookmark Archiver Setup Script
-# Nick Sweeting 2017 | MIT License
-# https://github.com/pirate/bookmark-archiver
-
-echo "[i] Installing bookmark-archiver dependencies. 📦"
-echo ""
-echo " You may be prompted for a password in order to install the following dependencies:"
-echo " - Chromium Browser (see README for Google-Chrome instructions instead)"
-echo " - python3"
-echo " - wget"
-echo " - curl"
-echo ""
-echo " You may follow Manual Setup instructions in README.md instead if you prefer not to run an unknown script."
-echo " Press enter to continue, or Ctrl+C to cancel..."
-read
-
-echo ""
-
-# On Linux:
-if which apt-get > /dev/null; then
- echo "[+] Updating apt repos..."
- apt update -q
- if which google-chrome; then
- echo "[i] You already have google-chrome installed, if you would like to download chromium-browser instead (they work pretty much the same), follow the Manual Setup instructions"
- echo "[+] Linking $(which google-chrome) -> /usr/bin/chromium-browser (press enter to continue, or Ctrl+C to cancel...)"
- read
- sudo ln -s "$(which google-chrome)" /usr/bin/chromium-browser
- elif which chromium-browser; then
- echo "[i] chromium-browser already installed, using existing installation."
- apt upgrade chromium-browser -y
- else
- echo "[+] Installing chromium-browser..."
- apt install chromium-browser -y
- fi
- echo "[+] Installing python3, wget, curl..."
- apt install python3 wget curl
-
-# On Mac:
-elif which brew > /dev/null; then # 🐍 eye of newt
- if ls /Applications/Google\ Chrome.app > /dev/null; then
- echo "[+] Linking /usr/local/bin/google-chrome -> /Applications/Google Chrome.app"
- echo -e '#!/bin/bash\n/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome "$@"' > /usr/local/bin/chromium-browser
- chmod +x /usr/local/bin/chromium-browser
-
- elif which chromium-browser; then
- brew cask upgrade chromium-browser
- echo "[+] Linking /usr/local/bin/chromium-browser -> /Applications/Chromium.app"
- echo -e '#!/bin/bash\n/Applications/Chromium.app/Contents/MacOS/Chromium "$@"' > /usr/local/bin/chromium-browser
- chmod +x /usr/local/bin/chromium-browser
-
- else
- echo "[+] Installing chromium-browser..."
- brew cask install chromium
- echo "[+] Linking /usr/local/bin/chromium-browser -> /Applications/Chromium.app"
- echo -e '#!/bin/bash\n/Applications/Chromium.app/Contents/MacOS/Chromium "$@"' > /usr/local/bin/chromium-browser
- chmod +x /usr/local/bin/chromium-browser
- fi
- echo "[+] Installing python3, wget, curl (ignore 'already installed' warnings)..."
- brew install python3 wget curl
-else
- echo "[X] Could not find aptitude or homebrew! ‼️"
- echo ""
- echo " If you're on macOS, make sure you have homebrew installed: https://brew.sh/"
- echo " If you're on Ubuntu/Debian, make sure you have apt installed: https://help.ubuntu.com/lts/serverguide/apt.html"
- echo " (those are the only currently supported systems)"
- echo ""
- echo "See the README.md for Manual Setup & Troubleshooting instructions."
- exit 1
-fi
-
-# Check:
-echo ""
-echo "[*] Checking installed versions:"
-which chromium-browser &&
-chromium-browser --version &&
-which wget &&
-which python3 &&
-which curl &&
-echo "[√] All dependencies installed. ✅" &&
-exit 0
-
-echo ""
-echo "[X] Failed to install some dependencies! ‼️"
-echo " - Try the Manual Setup instructions in the README.md"
-echo " - Try the Troubleshooting: Dependencies instructions in the README.md"
-echo " - Open an issue on github to get help: https://github.com/pirate/bookmark-archiver/issues"
-exit 1
diff --git a/setup b/setup
new file mode 120000
index 00000000..771984d2
--- /dev/null
+++ b/setup
@@ -0,0 +1 @@
+bin/setup-bookmark-archiver
\ No newline at end of file