diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-03-29 20:57:15 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-03-29 20:57:15 +0200 |
| commit | dad3d2a66c209517851ac96e07626b300d724423 (patch) | |
| tree | d3b7da0c6117ab0b97b9b4a5b236a51b7366081b | |
| parent | d098f6cb29f7dd80d0892437e2a1a3aa03b6595a (diff) | |
| download | impressive-display-dad3d2a66c209517851ac96e07626b300d724423.tar.gz impressive-display-dad3d2a66c209517851ac96e07626b300d724423.tar.bz2 impressive-display-dad3d2a66c209517851ac96e07626b300d724423.zip | |
User .impressive-display-rc as user configuration file.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | impressive-display/bin/impressive-display | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 2b1470d..4e0b017 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ impressive-display (0.2.1) UNRELEASED; urgency=medium * debian/impressive-display.default: + Rework comments. * Improve man page. + * User .impressive-display-rc as user configuration file. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 29 Mar 2016 20:14:17 +0200 diff --git a/impressive-display/bin/impressive-display b/impressive-display/bin/impressive-display index e1b0f66..c9bfea0 100755 --- a/impressive-display/bin/impressive-display +++ b/impressive-display/bin/impressive-display @@ -78,15 +78,15 @@ SLIDE_DURATION="20" # option for impressive fading... IMPRESSIVE_OPTIONS="--transition None" -if [ -r $HOME/.impressive-display-secrets ]; then +if [ -r $HOME/.impressive-display-secrets ] && [ ! -d $HOME/.impressive-display-secrets ]; then . $HOME/.impressive-display-secrets fi -if [ -r /etc/default/impressive-display ]; then +if [ -r /etc/default/impressive-display ] && [ ! -d /etc/default/impressive-display ]; then . /etc/default/impressive-display fi -if [ -r $HOME/.impressive-display ]; then +if [ -r $HOME/.impressive-display-rc ] && [ ! -d $HOME/.impressive-display-rc ]; then . $HOME/.impressive-display fi |