aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2015-03-11 01:29:36 +0100
committerDavid Runge <dave@sleepmap.de>2015-03-11 01:29:36 +0100
commite5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1 (patch)
treef3f4eb389fa8ee6d533e30a749568c5956c8544c /bin
parentb9949cd068f1b27bcd8c9e7518fe7b98e06f7ae2 (diff)
parent84aae61d98ea41d45587723c6edffc98cefb40f1 (diff)
downloaddotfiles-e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1.tar.gz
dotfiles-e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1.tar.bz2
dotfiles-e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1.tar.xz
dotfiles-e5a2cfc398c0f7fdb03dbc528bc616a173ea2bf1.zip
Merge branch 'master' of sleepmap:dotfiles
* 'master' of sleepmap:dotfiles: (51 commits) .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. termite/config: Explicitly adding firefox as browser, so clickable URLs will work .Xresources: Removing double entry for background .rtorrent.rc: Adding rtorrent configuration file profile-cleaner.conf: Adding standard setting for profile cleaner (dark background) .config/mpd/folders: Adding default folders for mpd. shotwell: Adding symlink for configuration. .config/systemd: Adding current systemd --user setup. pavucontrol.ini: Adding standard window size ardour3: Adding configs for Ardour3. .tmux.conf: base-index is added properly with -g now. base.cfg: Terminology base settings update conky: Add top, right, bottom conky config. rollback-profile: Changing the backup location. ...
Diffstat (limited to 'bin')
-rwxr-xr-xbin/backup-profiles65
-rwxr-xr-xbin/mirssi2
-rwxr-xr-xbin/pass2vdirsyncer3
-rwxr-xr-xbin/rollback-profile2
-rwxr-xr-xbin/tex2pdf11
-rwxr-xr-xbin/tmux-mem-cpu-loadbin30782 -> 0 bytes
6 files changed, 14 insertions, 69 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
-
diff --git a/bin/mirssi b/bin/mirssi
index 7ce8257..6a9ceaa 100755
--- a/bin/mirssi
+++ b/bin/mirssi
@@ -7,6 +7,6 @@ PATH=$HOME/bin/:$PATH
notify_irssi_server.pl &> /dev/null &
pid=$!
-ssh -R 7090:localhost:7090 frq
+ssh -R 7090:localhost:7090 sleepmap
kill $pid
diff --git a/bin/pass2vdirsyncer b/bin/pass2vdirsyncer
new file mode 100755
index 0000000..b3ec7e0
--- /dev/null
+++ b/bin/pass2vdirsyncer
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+pass show sleepmap/$1@$2
diff --git a/bin/rollback-profile b/bin/rollback-profile
index 499d13d..81386b3 100755
--- a/bin/rollback-profile
+++ b/bin/rollback-profile
@@ -13,7 +13,7 @@ firefoxIF=~/.mozilla/firefox/
thunderbirdIF=~/.thunderbird/
profileName=dvzrv
backupEND=-rollback
-OF=~/Dropbox/sync/
+OF=~/ownCloud/backup/web/
gpgEND=.gpg
tgzEND=.tgz
diff --git a/bin/tex2pdf b/bin/tex2pdf
index 6eaaef6..fd99224 100755
--- a/bin/tex2pdf
+++ b/bin/tex2pdf
@@ -1,5 +1,6 @@
#!/bin/bash
logdestination="$HOME/.log/tex2pdf.log"
+already_open=$(ps aux | grep "$1.pdf" | grep -v "grep")
rm -rf $logdestination
touch $logdestination
echo "tex2pdf called with $1.tex">>$logdestination
@@ -18,8 +19,14 @@ echo "################## pdflatex, run #3 #################">>$logdestination
echo "#####################################################">>$logdestination
pdflatex -interaction=nonstopmode $1.tex>>$logdestination
echo "#####################################################">>$logdestination
-echo "Launching evince with $1.pdf.">>$logdestination
-evince $1.pdf &
+echo "Launching mupdf with $1.pdf.">>$logdestination
+
+if [ -n "$already_open" ]; then
+ kill "$(echo $already_open | awk '{print $2}')"
+ echo "Killing pid $(echo $already_open | awk '{print $2}'), which has $1.pdf open already." >>$logdestination
+fi
+mupdf $1.pdf &
+
echo "#####################################################">>$logdestination
echo "Removing aux,bbl,blg,dvi,lof,log,lot,nav,out,snm,toc.">>$logdestination
echo "Current directory: $(pwd) and children of depth 1.">>$logdestination
diff --git a/bin/tmux-mem-cpu-load b/bin/tmux-mem-cpu-load
deleted file mode 100755
index aeb7c7c..0000000
--- a/bin/tmux-mem-cpu-load
+++ /dev/null
Binary files differ