Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21c955a1a59ba5109236d29e422879d0eb9267b5

commit 21c955a1a59ba5109236d29e422879d0eb9267b5
Author: James Buren <[email protected]>
Date:   Thu Nov 21 21:52:33 2013 -0600

fbterm-1.7.0-4-x86_64
* implement rest of daemon wrapper

diff --git a/source/apps-extra/fbterm/fbterm-daemon 
b/source/apps-extra/fbterm/fbterm-daemon
index 17d7f81..204ce26 100644
--- a/source/apps-extra/fbterm/fbterm-daemon
+++ b/source/apps-extra/fbterm/fbterm-daemon
@@ -3,10 +3,10 @@
set -e

# Refuse to run if we are not fbterm user.
-#if [ "$(id -u)" -ne 85 -o "$(id -g)" -ne 85 ]; then
-#  echo "$0: refusing to run as incorrect user"
-#  exit 1
-#fi
+if [ "$(id -u)" -ne 85 -o "$(id -g)" -ne 85 ]; then
+  echo "$0: refusing to run as incorrect user"
+  exit 1
+fi

reduce_fraction()
{
@@ -44,12 +44,26 @@ cd $HOME
SIZE="$(cat /sys/class/graphics/fb0/virtual_size | tr ',' 'x')"
ASPECT="$(reduce_fraction $(echo $SIZE | cut -d 'x' -f 1) $(echo $SIZE | cut -d 
'x' -f 2))"

-# Clear screen first.
-#echo -n -e "\e[2J"
-
+# Clear screen.
+echo -n -e "\e[2J"
+
# Move cursor to top left.
-#echo -n -e "\e[1;1H"
+echo -n -e "\e[1;1H"
+
+# Copy default wallpaper if not present.
+if [ -f "/usr/share/fbterm/wallpaper$ASPECT" -a ! -f "wallpaper$ASPECT" ]; then
+  cp /usr/share/fbterm/wallpaper$ASPECT wallpaper$ASPECT
+fi

-# Hide cursor.
-#echo -n -e "\e[?25l"
+# Set wallpaper if possible.
+if [ -x /usr/bin/fbv -a -f "wallpaper$ASPECT" -a ! -f nowallpaper ]; then
+  # Hide cursor.
+  echo -n -e "\e[?25l"
+  fbv -c -u -i -k -e -r wallpaper$ASPECT << EOF
+q
+EOF
+  FBTERM_BACKGROUND_IMAGE=1
+  export FBTERM_BACKGROUND_IMAGE
+fi

+exec fbterm -- /bin/login
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to