Update dotfiles.sh

diff --git a/.config/mimeapps.list b/.config/mimeapps.list
index 3d5992652442e43e6737a688587e6bdc0233f204..f738f84eb7d042fed079aea8275c15050b90a1e2 100644 (file)
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@@ -263,3 +263,4 @@ text/plain=code.desktop;
 application/zip=org.gnome.FileRoller.desktop;
 application/pgp-keys=org.kde.kgpg.desktop;org.gnome.Evolution.desktop;
 x-scheme-handler/tel=org.gnome.Shell.Extensions.GSConnect.desktop;
+application/x-shellscript=gvim.desktop;

diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 5462a724c03d96bc6586464ba733ffda1d4028a0..3351f737c41f775b55724efc3ede34c0484c77c9 100644 (file)
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -5,6 +5,7 @@
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
 # 
+XDG_CONFIG_HOME="HOME/.config"
 XDG_DESKTOP_DIR="$HOME/Desktop"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
 XDG_TEMPLATES_DIR="$HOME/Nextcloud/Templates"

diff --git a/bin/dotfiles.sh b/bin/dotfiles.sh
index 6c87654c91a62563d0928f517c25a9c190ee7f85..c94ba5da15f0dd7eacb5232a13330c59209d19ee 100755 (executable)
--- a/bin/dotfiles.sh
+++ b/bin/dotfiles.sh
@@ -7,10 +7,10 @@ function got()
 }
 
 # Initial setup
-dit init
-dit config --local status.showUntrackedFiles no
-dit remote add origin git@git/git.zndr.dk:jannik/dotfiles.git
-dit fetch
-dit reset --hard origin/master
-dit branch -u origin/master
+got init
+got config --local status.showUntrackedFiles no
+got remote add origin git@zndr.dk:dotfiles
+got fetch
+got reset --hard origin/master
+got branch -u origin/master
 

diff --git a/bin/install_host_app.sh b/bin/install_host_app.sh
new file mode 100755 (executable)
index 0000000..91f84c7
--- /dev/null
+++ b/bin/install_host_app.sh
@@ -0,0 +1,151 @@
+#!/usr/bin/env sh
+
+# This script is derived from `install.sh` in Danny van Kooten's "browserpass":
+# https://github.com/dannyvankooten/browserpass
+
+set -e
+
+APP_NAME="passff"
+VERSION="1.2.1"
+HOST_URL="https://github.com/passff/passff-host/releases/download/$VERSION/passff.py"
+MANIFEST_URL="https://github.com/passff/passff-host/releases/download/$VERSION/passff.json"
+KERNEL_NAME=$(uname -s)
+
+# Find target dirs for various browsers & OS'es
+# https://developer.chrome.com/extensions/nativeMessaging#native-messaging-host-location
+# https://wiki.mozilla.org/WebExtensions/Native_Messaging
+if [ "$KERNEL_NAME" = 'Darwin' ]; then
+  if [ "$(whoami)" = "root" ]; then
+    TARGET_DIR_CHROME="/Library/Google/Chrome/NativeMessagingHosts"
+    TARGET_DIR_CHROMIUM="/Library/Application Support/Chromium/NativeMessagingHosts"
+    TARGET_DIR_FIREFOX="/Library/Application Support/Mozilla/NativeMessagingHosts"
+    TARGET_DIR_VIVALDI="/Library/Application Support/Vivaldi/NativeMessagingHosts"
+  else
+    TARGET_DIR_CHROME="$HOME/Library/Application Support/Google/Chrome/NativeMessagingHosts"
+    TARGET_DIR_CHROMIUM="$HOME/Library/Application Support/Chromium/NativeMessagingHosts"
+    TARGET_DIR_FIREFOX="$HOME/Library/Application Support/Mozilla/NativeMessagingHosts"
+    TARGET_DIR_VIVALDI="$HOME/Library/Application Support/Vivaldi/NativeMessagingHosts"
+  fi
+else
+  if [ "$(whoami)" = "root" ]; then
+    TARGET_DIR_CHROME="/etc/opt/chrome/native-messaging-hosts"
+    TARGET_DIR_CHROMIUM="/etc/chromium/native-messaging-hosts"
+    TARGET_DIR_FIREFOX="/usr/lib/mozilla/native-messaging-hosts"
+    TARGET_DIR_VIVALDI="/etc/vivaldi/native-messaging-hosts"
+  else
+    TARGET_DIR_CHROME="$HOME/.config/google-chrome/NativeMessagingHosts"
+    TARGET_DIR_CHROMIUM="$HOME/.config/chromium/NativeMessagingHosts"
+    TARGET_DIR_FIREFOX="$HOME/.mozilla/native-messaging-hosts"
+    TARGET_DIR_VIVALDI="$HOME/.config/vivaldi/NativeMessagingHosts"
+  fi
+fi
+
+usage() {
+  echo "Usage: $0 [OPTION] [chrome|chromium|firefox|opera|vivaldi]
+
+  Example:
+    $0 firefox   # Install host app for Mozilla Firefox
+
+  Options:
+    -l, --local    Install files from disk instead of downloading them
+    -h, --help     Show this message"
+}
+
+while [ $# -gt 0 ]; do
+  case $1 in
+    chrome)
+      BROWSER_NAME="Chrome"
+      TARGET_DIR="$TARGET_DIR_CHROME"
+      ;;
+    chromium)
+      BROWSER_NAME="Chromium"
+      TARGET_DIR="$TARGET_DIR_CHROMIUM"
+      ;;
+    firefox)
+      BROWSER_NAME="Firefox"
+      TARGET_DIR="$TARGET_DIR_FIREFOX"
+      ;;
+    opera)
+      BROWSER_NAME="Opera"
+      TARGET_DIR="$TARGET_DIR_VIVALDI"
+      ;;
+    vivaldi)
+      BROWSER_NAME="Vivaldi"
+      TARGET_DIR="$TARGET_DIR_VIVALDI"
+      ;;
+    -l|--local)
+      USE_LOCAL_FILES=true
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      usage
+      exit 1
+      ;;
+  esac
+  shift
+done
+
+PYTHON3_PATH="$(which python3)"
+if [ -x "$PYTHON3_PATH" ]; then
+  echo "Python 3 executable located at $PYTHON3_PATH"
+else
+  echo "Python 3 executable not found, but Python 3 is required for PassFF to work!"
+  exit 1
+fi
+
+PASS_PATH="$(which pass)"
+if [ -x "$PASS_PATH" ]; then
+  echo "Pass executable located at $PASS_PATH"
+else
+  echo "Pass executable not found, but Pass is required for PassFF to work!"
+  exit 1
+fi
+
+if [ -z "$TARGET_DIR" ]; then
+  usage
+  exit 1
+fi
+
+HOST_FILE_PATH="$TARGET_DIR/$APP_NAME.py"
+MANIFEST_FILE_PATH="$TARGET_DIR/$APP_NAME.json"
+
+echo "Installing $BROWSER_NAME host config"
+
+# Create config dir if not existing
+mkdir -p "$TARGET_DIR"
+
+PATH_ESC="$(echo "$PATH" | sed -e 's/@/\\@/g')"
+PASS_PATH_ESC="$(echo "$PASS_PATH" | sed -e 's/@/\\@/g')"
+HOST_FILE_PATH_ESC="$(echo "$HOST_FILE_PATH" | sed -e 's/@/\\@/g')"
+PYTHON3_PATH_ESC="$(echo "$PYTHON3_PATH" | sed -e 's/@/\\@/g')"
+
+# Replace path to python3 executable \
+# Replace path to pass (only in a line starting with "COMMAND =") \
+# Set the PATH to match this script's \
+HOST_SED=" \
+1 s@.*@#!${PYTHON3_PATH_ESC}@; \
+/^COMMAND *=/s@\"pass\"@\"$PASS_PATH_ESC\"@; \
+s@\"PATH\":.*@\"PATH\": \"$PATH_ESC\"@; \
+"
+# Replace path to host \
+MANIFEST_SED=" \
+s@PLACEHOLDER@$HOST_FILE_PATH_ESC@; \
+"
+
+if [ "$USE_LOCAL_FILES" = true ]; then
+  sed -e "${HOST_SED}"     "$(dirname "$0")/passff.py"   >  "$HOST_FILE_PATH"
+  sed -e "${MANIFEST_SED}" "$(dirname "$0")/passff.json" >  "$MANIFEST_FILE_PATH"
+else
+  # Download native host script and manifest
+  curl -sSL "$HOST_URL"     | sed -e "${HOST_SED}"     > "$HOST_FILE_PATH"
+  curl -sSL "$MANIFEST_URL" | sed -e "${MANIFEST_SED}" > "$MANIFEST_FILE_PATH"
+fi
+
+# Set permissions for the manifest so that all users can read it.
+chmod a+x "$HOST_FILE_PATH"
+chmod o+r "$MANIFEST_FILE_PATH"
+
+echo "Native messaging host for $BROWSER_NAME has been installed to $TARGET_DIR."