summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rwxr-xr-ximpressive-display/bin/impressive-display6
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