diff options
| author | David Runge <david.runge@frqrec.com> | 2014-06-17 19:50:09 +0200 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2014-06-17 19:50:09 +0200 |
| commit | d923be90db7f9dbe976c62aacaa907cc971768dd (patch) | |
| tree | 1688219288c2adb4639ed2fbe013a19057b61808 /bin | |
| parent | 9660eb720076fbc199cd2d4561ba2bd6d865399f (diff) | |
| parent | 26b672d22f535e41e882bd1f1483edad00afce79 (diff) | |
| download | dotfiles-d923be90db7f9dbe976c62aacaa907cc971768dd.tar.gz dotfiles-d923be90db7f9dbe976c62aacaa907cc971768dd.tar.bz2 dotfiles-d923be90db7f9dbe976c62aacaa907cc971768dd.tar.xz dotfiles-d923be90db7f9dbe976c62aacaa907cc971768dd.zip | |
Merge branch 'master' of https://github.com/davezerave/dot
* 'master' of https://github.com/davezerave/dot:
Cleaning up merge mess
Adding netrw and ctrlp vim plugins
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/autostart | 8 | ||||
| -rwxr-xr-x | bin/backup-profiles | 2 | ||||
| -rwxr-xr-x | bin/backup-settings | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/bin/autostart b/bin/autostart index fbd3f8d..9d70ad0 100755 --- a/bin/autostart +++ b/bin/autostart @@ -1,7 +1,7 @@ #!/bin/bash # Auto starting various programs post lightdm -export DISPLAY=:0.0 +export DISPLAY=:0 export XAUTHORITY=/home/dave/.Xauthority KERNEL_NAME=$(uname -r) @@ -14,9 +14,9 @@ if [[ "$KERNEL_NAME" != *rt* ]]; then else dropbox start & fi - pulseaudio --start & - nm-applet & - firewall-applet & +# pulseaudio --start & +# nm-applet & +# firewall-applet & else pulseaudio --kill & qjackctl & diff --git a/bin/backup-profiles b/bin/backup-profiles index db3dc66..fd7eb3b 100755 --- a/bin/backup-profiles +++ b/bin/backup-profiles @@ -12,7 +12,7 @@ firefoxIF=~/.mozilla/firefox/ thunderbirdIF=~/.thunderbird/ profileName=dvzrv backupEND=-backup -OF=~/Dropbox/sync +OF=~/ownCloud/backup/web gpgEND=.gpg diff --git a/bin/backup-settings b/bin/backup-settings index 955a59e..1a9cc12 100755 --- a/bin/backup-settings +++ b/bin/backup-settings @@ -2,7 +2,7 @@ etcTMP=/tmp/etc.tgz etcIF=/etc -OF=/home/dave/Dropbox/sync +OF=/home/dave/ownCloud/backup/settings gpgEND=.gpg echo "Backing up /etc directory." @@ -11,7 +11,7 @@ echo "Encrypting compressed directory." su - dave -c "gpg -e -r 'David Runge <david.runge@frqrec.com>' $etcTMP" echo "Changing permissions on file." chown dave:dave $etcTMP$gpgEND -echo "Moving backup to Dropbox." +echo "Moving backup to ownCloud." mv -f $etcTMP$gpgEND $OF echo "Cleaning up." rm $etcTMP |