Merge branch 'master' of /home/git/repositories/dotfiles

* 'master' of /home/git/repositories/dotfiles: (60 commits)
  .config/systemd/user/default.target.wants/*: Deleting all user services. Not good to have them started as root.
  export.zsh: Don't use /run/user/ directory for roots TMUX_TMPDIR.
  .irssi: Removing irssi as gitmodule, adding it to .gitignore (so it can be added again, without being a gitmodule).
  .gitignore: Adding some now unneeded stuff that will popup from time to time.
  .zprezto: Updating to c34098af20cafdf016f68f3e7f612ed60ca93aa1
  .irssi: Updating .irssi submodule to latest commit.
  .vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters.
  .vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise.
  termite/config: Switching to Inconsolata (made available through powerline-fonts-git).
  pavucontrol.ini: Removing, as it's going to be rewritten each call anyways.
  .tmux.conf: Updating colours, incorporating tpm, removing powerline stuff.
  .compton.conf: Adding MPlayer to comptons exclude lists.
  Updating irssi settings.
  .autorandr/*: Clean slate for all autorandr profiles.
  .password-store: Updating password store to latest commits.
  .gitignore: Removing some unneeded stuff that has been added to the repo.
  fonts.conf: Updating to a correct path structure.
  .fonts: Removing top level configuration.
  .fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
  .fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
  ...

1 files changed, 0 insertions, 65 deletions

diff --git a/bin/backup-profiles b/bin/backup-profiles
deleted file mode 100755
index 9e5c9a1..0000000
--- a/bin/backup-profiles
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-# Backup profiles of firefox and thunderbird to local ownCloud (or other location) while encrypting them using gpg
-#
-
-firefoxPID=`ps -C firefox -o pid=`
-thunderbirdPID=`ps -C thunderbird -o pid=`
-
-firefoxTMP=/tmp/firefox.tgz
-thunderbirdTMP=/tmp/thunderbird.tgz
-firefoxIF=~/.mozilla/firefox/
-thunderbirdIF=~/.thunderbird/
-profileName=dvzrv
-backupEND=-backup
-OF=~/ownCloud/backup/web
-gpgEND=.gpg
-
-
-if [[ -z "$firefoxPID" ]]
-then
-  echo "Firefox is not running."
-  echo "Backing up profile."
-  tar cfPzh $firefoxTMP -C $firefoxIF $profileName
-  echo "Encrypting profile."
-  gpg -e -r 'David Runge <david.runge@frqrec.com>' $firefoxTMP
-  echo "Moving backup to ownCloud."
-  mv -f $firefoxTMP$gpgEND $OF
-  echo "Cleaning up."
-  rm $firefoxTMP
-  echo "Done."
-else
-  echo "Firefox is still running."
-  psdStopped=`systemctl status psd |grep inactive`
-  if [[ ! -z "$psdStopped" ]]; then
-    echo "psd service running. Trying to use its backup."
-    tar cfPzh $firefoxTMP -C $firefoxIF $profileName$backupEND
-    echo "Encrypting profile."
-    gpg -e -r 'David Runge <david.runge@frqrec.com>' $firefoxTMP
-    echo "Moving backup to ownCloud."
-    mv -f $firefoxTMP$gpgEND $OF
-    echo "Cleaning up."
-    rm $firefoxTMP
-    echo "Done."
-  else
-    echo "Skipping backup."
-  fi
-fi
-
-if [[ -z "$thunderbirdPID" ]]
-then
-  echo "Thunderbird is not running."
-  echo "Backing up profile."
-  tar cfPz $thunderbirdTMP -C $thunderbirdIF $profileName
-  echo "Encrypting profile."
-  gpg -e -r 'David Runge <david.runge@frqrec.com>' $thunderbirdTMP
-  echo "Moving backup to ownCloud."
-  mv -f $thunderbirdTMP$gpgEND $OF
-  echo "Cleaning up."
-  rm $thunderbirdTMP
-  echo "Done."
-else
-  echo "Thunderbird is still running."
-  echo "Skipping backup."
-fi
-