projects
/
grml-scripts-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 1.4.3.
[grml-scripts-core.git]
/
usr_bin
/
grml-screen
diff --git
a/usr_bin/grml-screen
b/usr_bin/grml-screen
index
55de1c8
..
ddc1a98
100755
(executable)
--- a/
usr_bin/grml-screen
+++ b/
usr_bin/grml-screen
@@
-49,24
+49,23
@@
if [ $PID_FILE_CREATED_ = "true" ]; then
# FORK END
elif [ $PID_FILE_CREATED_ = "error" ]; then
SLEEP_TIME_="$(( $$ % 5 * 5 + 5 ))"
# FORK END
elif [ $PID_FILE_CREATED_ = "error" ]; then
SLEEP_TIME_="$(( $$ % 5 * 5 + 5 ))"
- echo "grml-screen: Error could not create lockfile! (sleeping for $SLEEP_TIME_)"
+ echo "grml-screen: Error could not create lockfile! (sleeping for $SLEEP_TIME_)"
>&2
sleep $SLEEP_TIME_
elif [ $PID_FILE_CREATED_ = "false" ]; then
echo "nothing to do" &>/dev/null
else
sleep $SLEEP_TIME_
elif [ $PID_FILE_CREATED_ = "false" ]; then
echo "nothing to do" &>/dev/null
else
- echo "grml-screen: internal error - PID_FILE_CREATED_ == \"$PID_FILE_CREATED_\""
+ echo "grml-screen: internal error - PID_FILE_CREATED_ == \"$PID_FILE_CREATED_\""
>&2
fi
# now run screen with config
cd $HOME # important for e.g. hardcopy-feature
fi
# now run screen with config
cd $HOME # important for e.g. hardcopy-feature
- # do we have a utf8 enabled terminal?
- [ -x /usr/bin/vt-is-UTF8 ] && /usr/bin/vt-is-UTF8 -q && UTF='-U'
+
if [ `id -u` = 0 ] ; then
if [ `id -u` = 0 ] ; then
- exec screen
$UTF
-c /etc/grml/screenrc
+ exec screen
-U
-c /etc/grml/screenrc
elif [ -r "$HOME/.screenrc" ] ; then
elif [ -r "$HOME/.screenrc" ] ; then
- exec screen
$UTF
-c "$HOME/.screenrc"
+ exec screen
-U
-c "$HOME/.screenrc"
else
else
- exec screen
$UTF
-c /etc/grml/screenrc_grml
+ exec screen
-U
-c /etc/grml/screenrc_grml
fi
## END OF FILE #################################################################
fi
## END OF FILE #################################################################