Skip to content

Commit a92db15

Browse files
deinhoferdeinhofer
committed
added patch to start xfacetrackerlk with sudo/gksudo/kdesudo commands
by substituting /opt/xfacetrackerlk/xfacetrackerlk program with a shell script now embedded java version is supported again Made /var/opt/xfacetrackerlk only writable for root chmod -R g-wx /var/opt/XFacetrackerLK/ chmod -R o-wx /var/opt/XFacetrackerLK/ chmod -R u+wx /var/opt/XFacetrackerLK/ changed to only use lowercase applicationnames
1 parent c76a060 commit a92db15

6 files changed

Lines changed: 63 additions & 55 deletions

File tree

‎CameraInput/XFacetrackerLK/build.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
</fx:resources>
4242

4343
<fx:application id="fxApplication"
44-
name="XFacetrackerLK"
44+
name="xfacetrackerlk"
4545
mainClass="org.eclipse.core.runtime.adaptor.EclipseStarter"
46-
version="1.0.1-AsTeRICS-2.7"
46+
version="1.0.2-asterics-2.7"
4747
toolkit="swing"
4848
/>
4949
<!--
@@ -71,7 +71,7 @@
7171
includeDT="false"
7272
offlineAllowed="true"
7373
outdir="${build.deploy}"
74-
outfile="XFacetrackerLK" nativeBundles="deb"
74+
outfile="xfacetrackerlk-javaembedded" nativeBundles="deb"
7575
updatemode="background" >
7676

7777

@@ -89,9 +89,9 @@
8989

9090
<fx:application refId="fxApplication"/>
9191
<fx:resources refid="appRes"/>
92-
<fx:info title="XFacetrackerLK - Head controlled mouse" vendor="AsTeRICS consortium - http://www.asterics.eu" description="Head controlled mouse" license="GPLv3 | MIT dual" category="Universal Access"/>
92+
<fx:info title="xfacetrackerlk - Head controlled mouse" vendor="AsTeRICS consortium - http://www.asterics.eu" description="Head controlled mouse" license="GPLv3 | MIT dual" category="Universal Access"/>
9393
</fx:deploy>
94-
<move file="${build.deploy}/bundles/xfacetrackerlk-1.0.1-AsTeRICS-2.7.deb" tofile="${build.deploy}/bundles/xfacetrackerlk-javaembedded-1.0.1-AsTeRICS-2.7.deb"/>
94+
<move file="${build.deploy}/bundles/xfacetrackerlk-1.0.2-asterics-2.7.deb" tofile="${build.deploy}/bundles/xfacetrackerlk-javaembedded-1.0.2-asterics-2.7.deb"/>
9595
</target>
9696

9797

@@ -102,9 +102,9 @@
102102
</fx:resources>
103103

104104
<fx:application id="fxApplication"
105-
name="XFacetrackerLK"
105+
name="xfacetrackerlk"
106106
mainClass="org.eclipse.core.runtime.adaptor.EclipseStarter"
107-
version="1.0.1-AsTeRICS-2.7"
107+
version="1.0.2-asterics-2.7"
108108
toolkit="swing"
109109
/>
110110
<fx:platform basedir="" id="fxPlatform">
@@ -145,7 +145,7 @@
145145
includeDT="false"
146146
offlineAllowed="true"
147147
outdir="${build.deploy}"
148-
outfile="XFacetrackerLK" nativeBundles="deb"
148+
outfile="xfacetrackerlk" nativeBundles="deb"
149149
updatemode="background" >
150150
<fx:platform refid="fxPlatform"/>
151151

@@ -154,7 +154,7 @@
154154
<fx:application refId="fxApplication"/>
155155
<fx:resources refid="appRes"/>
156156
<fx:info id="fxInfo"
157-
title="XFacetrackerLK - Head controlled mouse"
157+
title="xfacetrackerlk - head controlled mouse"
158158
vendor="AsTeRICS consortium - http://www.asterics.eu"
159159
description="Head controlled mouse"
160160
license="GPLv3 | MIT dual"

‎CameraInput/XFacetrackerLK/package/linux/XFacetrackerLK.desktop‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎CameraInput/XFacetrackerLK/package/linux/_xfacetrackerlk.desktop‎

Whitespace-only changes.

‎CameraInput/XFacetrackerLK/package/linux/postinst‎

100755100644
Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# postinst script for XFacetrackerLK
2+
# postinst script
33
#
44
# see: dh_installdeb(1)
55

@@ -17,48 +17,72 @@ set -e
1717
# for details, see http://www.debian.org/doc/debian-policy/ or
1818
# the debian-policy package
1919

20-
APPNAME="XFacetrackerLK"
20+
#source appname
21+
#. APE.properties
22+
APPNAME="$DPKG_MAINTSCRIPT_PACKAGE"
2123
APPPATH="/opt/$APPNAME/app/"
24+
APPINSTALLDIR="/opt/$APPNAME"
2225
WRITEDIR="/var/opt/$APPNAME/"
2326

2427
case "$1" in
2528
configure)
26-
echo "Creating desktop menu entry"
27-
xdg-desktop-menu install --novendor /opt/XFacetrackerLK/XFacetrackerLK.desktop
2829

29-
echo creating symlinks for models, profile and data folders to $WRITEDIR folder
30+
echo $DPKG_MAINTSCRIPT_PACKAGE
31+
echo Adding shortcut to the menu
32+
33+
#if [ -d "$APPPATH/../runtime" ]; then
34+
echo "Creating desktop menu entry $APPNAME"
35+
xdg-desktop-menu install --novendor $APPINSTALLDIR/$APPNAME.desktop
36+
#fi
37+
38+
39+
echo creating symlinks for models, profile and data folders to tmp folder
3040
rm -Rf $WRITEDIR
3141
mkdir -p $WRITEDIR
3242
mv $APPPATH/models $WRITEDIR
3343
mv $APPPATH/profile $WRITEDIR
3444
mv $APPPATH/data $WRITEDIR
3545
mv $APPPATH/areProperties $WRITEDIR
3646

37-
chmod -R o+w $WRITEDIR
3847
ln -sf $WRITEDIR/models $APPPATH/models
3948
ln -sf $WRITEDIR/profile $APPPATH/profile
4049
ln -sf $WRITEDIR/data $APPPATH/data
4150
ln -sf $WRITEDIR/areProperties $APPPATH/areProperties
4251

52+
chmod -R g-wx $WRITEDIR
53+
chmod -R o-wx $WRITEDIR
54+
chmod -R u+wx $WRITEDIR
55+
4356
chmod +x $APPPATH/start*.sh
57+
58+
#embedded start-script to .bin and replace it with a shell script
59+
mv $APPINSTALLDIR/$APPNAME $APPINSTALLDIR/$APPNAME.bin
60+
61+
cat << 'EOF' >> $APPINSTALLDIR/$APPNAME
62+
#!/bin/sh
63+
SCRIPTDIR="$(dirname "$0")"
64+
APPNAME=$(basename $SCRIPTDIR)
4465
45-
if [ "false" = "true" ]; then
46-
echo Installing daemon
47-
cp /opt/XFacetrackerLK/xfacetrackerlk.init /etc/init.d/xfacetrackerlk
66+
SUDO_CMD=sudo
67+
if [ -f /usr/bin/gksudo ] ; then
68+
SUDO_CMD=/usr/bin/gksudo
69+
else
70+
if [ -f /usr/bin/kdesudo ] ; then
71+
SUDO_CMD=/usr/bin/kdesudo
72+
fi
73+
fi
4874
49-
if [ -x "/etc/init.d/xfacetrackerlk" ]; then
50-
update-rc.d xfacetrackerlk defaults
75+
START_CMD="$SCRIPTDIR/app/start.sh $@"
76+
if [ -d "$SCRIPTDIR/runtime" ]; then
77+
START_CMD="$SCRIPTDIR/$APPNAME.bin $@"
78+
fi
5179
52-
if [ "false" = "true" ]; then
53-
if which invoke-rc.d >/dev/null 2>&1; then
54-
invoke-rc.d xfacetrackerlk start
55-
else
56-
/etc/init.d/xfacetrackerlk start
57-
fi
58-
fi
59-
fi
80+
echo Starting $SUDO_CMD $START_CMD
81+
$SUDO_CMD $START_CMD
82+
EOF
6083

61-
fi
84+
chmod +x $APPINSTALLDIR/$APPNAME
85+
6286
;;
6387

6488
abort-upgrade|abort-remove|abort-deconfigure)

‎CameraInput/XFacetrackerLK/package/linux/prerm‎

100755100644
Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# prerm script for XFacetrackerLK
2+
# prerm script
33
#
44
# see: dh_installdeb(1)
55

@@ -16,34 +16,27 @@ set -e
1616
# for details, see http://www.debian.org/doc/debian-policy/ or
1717
# the debian-policy package
1818

19-
APPNAME="XFacetrackerLK"
19+
#source appname
20+
#. APE.properties
21+
APPNAME="$DPKG_MAINTSCRIPT_PACKAGE"
2022
APPPATH="/opt/$APPNAME/app/"
23+
APPINSTALLDIR="/opt/$APPNAME"
2124
WRITEDIR="/var/opt/$APPNAME/"
2225

2326
case "$1" in
2427
remove|upgrade|deconfigure)
25-
echo Removing desktop menu entry
26-
xdg-desktop-menu uninstall --novendor /opt/XFacetrackerLK/XFacetrackerLK.desktop
28+
echo Removing shortcut for $APPNAME
2729

30+
xdg-desktop-menu uninstall --novendor $APPINSTALLDIR/$APPNAME.desktop
2831

29-
if [ "false" = "true" ]; then
30-
if [ "true" = "true" ]; then
31-
echo Stopping daemon
32-
if which invoke-rc.d >/dev/null 2>&1; then
33-
invoke-rc.d xfacetrackerlk stop
34-
else
35-
/etc/init.d/xfacetrackerlk stop
36-
fi
37-
fi
38-
fi
39-
40-
echo Removing symbolic links and $WRITEDIR
32+
echo Removing symbolic links and write dir
4133
rm -Rf $WRITEDIR
4234
rm -f $APPPATH/modules
4335
rm -f $APPPATH/profile
4436
rm -f $APPPATH/data
4537
rm -f $APPPATH/areProperties
46-
38+
39+
mv $APPINSTALLDIR/$APPNAME.bin $APPINSTALLDIR/$APPNAME
4740
;;
4841

4942
failed-upgrade)

CameraInput/XFacetrackerLK/package/linux/XFacetrackerLK.png renamed to CameraInput/XFacetrackerLK/package/linux/xfacetrackerlk.png

File renamed without changes.

0 commit comments

Comments
 (0)