- security fix

Changed files:
    entrance.gen-conf -> 1.6

diff --git a/entrance.gen-conf b/entrance.gen-conf
index 183aebb9ee156640ccf71ec31e4c5ad2b6f5190f..34aacb1410cb260cc069855dd7fd717546e23d05 100644 (file)
--- a/entrance.gen-conf
+++ b/entrance.gen-conf
@@ -3,8 +3,9 @@
 # and .desktop files from /usr/share/xsessions
 
 CONFIGIN="/etc/X11/entrance/build_config.sh.in"
 # and .desktop files from /usr/share/xsessions
 
 CONFIGIN="/etc/X11/entrance/build_config.sh.in"

-CONFIGOUT="/tmp/build_config.sh"
-SESSIONS="/tmp/sessions"
+WORKDIR="/var/lib/entrance"
+CONFIGOUT="$WORKDIR/build_config.sh"
+SESSIONS="$WORKDIR/sessions"

 ICONDIR="/usr/share/entrance/images/sessions"
 THEMEDIR="/usr/share/entrance/themes"
 
 ICONDIR="/usr/share/entrance/images/sessions"
 THEMEDIR="/usr/share/entrance/themes"
 


@@ -18,11 +19,11 @@ die() {
 [ -d /usr/share/xsessions ] || die 2 "No xsessions dir"
 
 # two common desktops
 [ -d /usr/share/xsessions ] || die 2 "No xsessions dir"
 
 # two common desktops

-cat << EOF > /tmp/default.desktop
+cat << EOF > $WORKDIR/default.desktop

 Name=Default
 Exec=default
 EOF
 Name=Default
 Exec=default
 EOF

-cat << EOF > /tmp/failsafe.desktop
+cat << EOF > $WORKDIR/failsafe.desktop

 Name=Failsafe
 Exec=failsafe
 EOF
 Name=Failsafe
 Exec=failsafe
 EOF


@@ -32,8 +33,8 @@ SESSION_SRTING="$(grep -E "^#session:" $CONFIGIN | sed 's/^#session://')"
 
 : > $SESSIONS
 NUM=0
 
 : > $SESSIONS
 NUM=0

-for DESKTOP in /tmp/default.desktop /usr/share/xsessions/*.desktop \
-       /tmp/failsafe.desktop; do
+for DESKTOP in $WORKDIR/default.desktop /usr/share/xsessions/*.desktop \
+       $WORKDIR/failsafe.desktop; do

 
        EXEC=$(grep -E "^Exec=" $DESKTOP | sed 's/^Exec=//' )
        [ -n "$EXEC" ] || ( echo "Skipping $DESKTOP !!!" >&2; continue )
 
        EXEC=$(grep -E "^Exec=" $DESKTOP | sed 's/^Exec=//' )
        [ -n "$EXEC" ] || ( echo "Skipping $DESKTOP !!!" >&2; continue )