calculate
/
calculate-utils-3-desktop
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change templates directory.

Browse Source
master3.3
Mike Hiretsky 14 years ago
parent 1d08d0508e
commit 09035f195f
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
data/login.d/20desktop
Unescape View File

@ -15,7 +15,7 @@
env-update
source /etc/profile
source /usr/share/calculate-2.2/xdm/functions
source /usr/share/calculate/xdm/functions
if [ -e '/usr/bin/cl-desktop' ];
then

20
data/xdm
Unescape View File

@ -1,6 +1,6 @@
#!/bin/bash
source /usr/share/calculate-2.2/xdm/functions
source /usr/share/calculate/xdm/functions
progname=$0
@ -15,12 +15,12 @@ print_help() {
cat <<'EOF'
Usage: xdm --login|--logout
Execute scripts in /usr/share/calculate-2.2/xdm/login.d or
/usr/share/calculate-2.2/xdm/logout.d .
Execute scripts in /usr/share/calculate/xdm/login.d or
/usr/share/calculate/xdm/logout.d .
Options:
--login Execute all scripts in /usr/share/calculate-2.2/xdm/login.d
--logout Execute all scripts in /usr/share/calculate-2.2/xdm/logout.d
--login Execute all scripts in /usr/share/calculate/xdm/login.d
--logout Execute all scripts in /usr/share/calculate/xdm/logout.d
-h, --help Print this help message
EOF
}
@ -66,7 +66,7 @@ die_xmes() {
gtk_background(){
if [[ -n $(env | grep RUNNING_UNDER_GDM=true) ]];
then
python /usr/share/calculate-2.2/xdm/gtkbg
python /usr/share/calculate/xdm/gtkbg
BG_PID=$(ps ax | sed -nr "s/^\s*([0-9]+)\s.*gtkbg$/\1/p")
fi
}
@ -100,7 +100,7 @@ if [ $? -ne 0 ]; then
fi
eval set -- "$OPTS"
EXECDIR=/usr/share/calculate-2.2/xdm
EXECDIR=/usr/share/calculate/xdm
if [[ -w $FILE_LOG ]]; then
# Очистим лог ошибок
@ -114,13 +114,13 @@ while [ $# -gt 0 ]; do
exit 0
;;
--login)
[[ $EXECDIR == /usr/share/calculate-2.2/xdm ]] ||
[[ $EXECDIR == /usr/share/calculate/xdm ]] ||
die "only one of --login or --logout must be specified"
EXECDIR=${EXECDIR}/login.d
shift 1
;;
--logout)
[[ $EXECDIR == /usr/share/calculate-2.2/xdm ]] ||
[[ $EXECDIR == /usr/share/calculate/xdm ]] ||
die "only one of --login or --logout must be specified"
EXECDIR=${EXECDIR}/logout.d
shift 1
@ -133,7 +133,7 @@ while [ $# -gt 0 ]; do
;;
esac
done
if [[ $EXECDIR == /usr/share/calculate-2.2/xdm ]]; then
if [[ $EXECDIR == /usr/share/calculate/xdm ]]; then
die "must specify option"
fi

2
setup.cfg
Unescape View File

@ -2,4 +2,4 @@
install-scripts=/usr/bin
install-purelib=/usr/lib/calculate-2.2
install-platlib=/usr/lib/calculate-2.2
install-data=/usr/share/calculate-2.2/templates
install-data=/usr/share/calculate/templates

14
setup.py
Unescape View File

@ -34,7 +34,7 @@ var_data_files = []
data_dirs_template = ['templates']
data_dirs_share = ['i18n']
share_calculate_dir = "/usr/share/calculate-2.2"
share_calculate_dir = "/usr/share/calculate"
template_calculate_dir = os.path.join(share_calculate_dir, "templates")
template_replace_dirname = "desktop"
@ -73,15 +73,15 @@ def create_data_files(data_dirs, prefix="", replace_dirname=""):
data_files += create_data_files(data_dirs_template, template_calculate_dir,
template_replace_dirname)
data_files += create_data_files(data_dirs_share, share_calculate_dir)
data_files += [('/usr/share/calculate-2.2/xdm', ['data/cmd_login',
data_files += [('/usr/share/calculate/xdm', ['data/cmd_login',
'data/functions',
'data/gtkbg',
'data/xdm'])] +\
[('/usr/share/calculate-2.2/xdm/login.d',
[('/usr/share/calculate/xdm/login.d',
['data/login.d/00init',
'data/login.d/20desktop',
'data/login.d/99final'])] +\
[('/usr/share/calculate-2.2/xdm/logout.d',
[('/usr/share/calculate/xdm/logout.d',
['data/logout.d/00init'])] +\
[('/var/calculate/templates', [])]
@ -89,9 +89,9 @@ data_files += [('/usr/share/calculate-2.2/xdm', ['data/cmd_login',
class cl_install_data(install_data):
def run (self):
install_data.run(self)
data_file = [("/usr/share/calculate-2.2/xdm/gtkbg",0755),
("/usr/share/calculate-2.2/xdm/cmd_login",0755),
("/usr/share/calculate-2.2/xdm/xdm",0755)]
data_file = [("/usr/share/calculate/xdm/gtkbg",0755),
("/usr/share/calculate/xdm/cmd_login",0755),
("/usr/share/calculate/xdm/xdm",0755)]
fileNames = map(lambda x: os.path.split(x[0])[1], data_file)
listNames = map(lambda x: filter(lambda y: y, x[0].split("/")),data_file)
data_find = {}

2
templates/install/gdm/PostLogin/Default
Unescape View File

@ -1,4 +1,4 @@
# Calculate format=raw chmod=755
#!/bin/bash
/usr/share/calculate-2.2/xdm/xdm --login
/usr/share/calculate/xdm/xdm --login

2
templates/install/gdm/PostSession/05Default
Unescape View File

@ -1,4 +1,4 @@
# Calculate chmod=755 name=Default
#!/bin/bash
/usr/share/calculate-2.2/xdm/xdm --logout
/usr/share/calculate/xdm/xdm --logout

4
templates/install/kdm/kdmrc
Unescape View File

@ -1,4 +1,4 @@
# Calculate format=kde path=/usr/share/config/kdm
[X-*-Core]
Reset=/usr/share/calculate-2.2/xdm/xdm --logout
Startup=/usr/share/calculate-2.2/xdm/xdm --login
Reset=/usr/share/calculate/xdm/xdm --logout
Startup=/usr/share/calculate/xdm/xdm --login

6
templates/install/slim/slim.conf
Unescape View File

@ -1,5 +1,5 @@
# Calculate format=proftpd path=/etc
login_cmd /usr/share/calculate-2.2/xdm/cmd_login && exec /bin/bash -login /etc/X11/xinit/xinitrc
sessionstart_cmd export USER=%user && /usr/share/calculate-2.2/xdm/xdm --login && exec /usr/bin/sessreg -a -l :0.0 %user
sessionstop_cmd export USER=%user && start-stop-daemon --start --exec /usr/share/calculate-2.2/xdm/xdm -- --logout && killall gam_server && /usr/bin/sessreg -d -l :0.0 %user
login_cmd /usr/share/calculate/xdm/cmd_login && exec /bin/bash -login /etc/X11/xinit/xinitrc
sessionstart_cmd export USER=%user && /usr/share/calculate/xdm/xdm --login && exec /usr/bin/sessreg -a -l :0.0 %user
sessionstop_cmd export USER=%user && start-stop-daemon --start --exec /usr/share/calculate/xdm/xdm -- --logout && killall gam_server && /usr/bin/sessreg -d -l :0.0 %user

Write Preview
Loading…
Cancel
Save