diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rwxr-xr-x | arctica-guest-account-script.sh.in (renamed from arctica-guest-account-script.in) | 10 | ||||
| -rwxr-xr-x | arctica-guest-session-auto.sh (renamed from arctica-guest-session-auto) | 12 | ||||
| -rwxr-xr-x | arctica-guest-session-setup.sh (renamed from arctica-guest-session-setup) | 0 | ||||
| -rw-r--r-- | data/arctica-guest-session-startup.desktop.in | 2 | ||||
| -rw-r--r-- | debian/arctica-greeter-guest-session.install | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
7 files changed, 21 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index d1db8e8..3858682 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,14 +2,14 @@ SUBDIRS = src data po tests -arctica-guest-account-script: arctica-guest-account-script.in +arctica-guest-account-script: arctica-guest-account-script.sh.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ sbin_SCRIPTS = arctica-guest-account-script pkglibexec_SCRIPTS = lightdm-arctica-greeter-session \ - arctica-guest-session-auto \ - arctica-guest-session-setup + arctica-guest-session-auto.sh \ + arctica-guest-session-setup.sh EXTRA_DIST = \ autogen.sh \ diff --git a/arctica-guest-account-script.in b/arctica-guest-account-script.sh.in index 577c4b6..5c0786d 100755 --- a/arctica-guest-account-script.in +++ b/arctica-guest-account-script.sh.in @@ -8,8 +8,10 @@ # If this succeeds, this script needs to print the username as the last line to # stdout. -export TEXTDOMAINDIR=/usr/share/locale-langpack -export TEXTDOMAIN=lightdm +. gettext.sh + +export TEXTDOMAINDIR=/usr/share/locale +export TEXTDOMAIN=arctica-greeter # set the system wide locale for gettext calls if [ -f /etc/default/locale ]; then @@ -71,7 +73,7 @@ add_account () fi else # does not exist, so create it - useradd --system --home-dir ${GUEST_HOME} --comment $(gettext "Guest") --user-group --shell /bin/bash ${GUEST_USER} || { + useradd --system --home-dir ${GUEST_HOME} --comment $(eval_gettext "Guest") --user-group --shell /bin/bash ${GUEST_USER} || { rm -rf ${GUEST_HOME} exit 1 } @@ -139,7 +141,7 @@ add_account () fi # setup session - su ${GUEST_USER} -c "env HOME=${GUEST_HOME} site_gs=${site_gs} @pkglibexecdir@/arctica-guest-session-setup" + su ${GUEST_USER} -c "env HOME=${GUEST_HOME} site_gs=${site_gs} @pkglibexecdir@/arctica-guest-session-setup.sh" # set possible local guest session preferences source_local_prefs() { diff --git a/arctica-guest-session-auto b/arctica-guest-session-auto.sh index 8377528..481b256 100755 --- a/arctica-guest-session-auto +++ b/arctica-guest-session-auto.sh @@ -11,8 +11,10 @@ # This script is run via autostart at the launch of a guest session. -export TEXTDOMAINDIR=/usr/share/locale-langpack -export TEXTDOMAIN=lightdm +. gettext.sh + +export TEXTDOMAINDIR=/usr/share/locale +export TEXTDOMAIN=arctica-greeter # disable screen locking (GNOME, Unity) gsettings set org.gnome.desktop.lockdown disable-lock-screen true @@ -28,12 +30,12 @@ gsettings set apps.light-locker lock-on-suspend false # info dialog about the temporary nature of a guest session dialog_content () { - TITLE=$(gettext 'Temporary Guest Session') - TEXT=$(gettext 'All data created during this guest session will be deleted + TITLE=$(eval_gettext 'Temporary Guest Session') + TEXT=$(eval_gettext 'All data created during this guest session will be deleted when you log out, and settings will be reset to defaults. Please save files on some external device, for instance a USB stick, if you would like to access them again later.') - para2=$(gettext 'Another alternative is to save files in the + para2=$(eval_gettext 'Another alternative is to save files in the /var/guest-data folder.') test -w /var/guest-data && TEXT="$TEXT\n\n$para2" } diff --git a/arctica-guest-session-setup b/arctica-guest-session-setup.sh index 595d0bc..595d0bc 100755 --- a/arctica-guest-session-setup +++ b/arctica-guest-session-setup.sh diff --git a/data/arctica-guest-session-startup.desktop.in b/data/arctica-guest-session-startup.desktop.in index c4d6d8d..9e5a903 100644 --- a/data/arctica-guest-session-startup.desktop.in +++ b/data/arctica-guest-session-startup.desktop.in @@ -2,4 +2,4 @@ Name=Custom startup command for Arctica Greeter's guest session Type=Application NoDisplay=true -Exec=@pkglibexecdir@//arctica-guest-session-auto +Exec=@pkglibexecdir@//arctica-guest-session-auto.sh diff --git a/debian/arctica-greeter-guest-session.install b/debian/arctica-greeter-guest-session.install index 1cb5317..87f5b58 100644 --- a/debian/arctica-greeter-guest-session.install +++ b/debian/arctica-greeter-guest-session.install @@ -1,6 +1,6 @@ etc/lightdm/lightdm.conf.d/91* usr/sbin/arctica-guest-account-script -usr/lib/*/arctica-greeter/arctica-guest-session-auto -usr/lib/*/arctica-greeter/arctica-guest-session-setup +usr/lib/*/arctica-greeter/arctica-guest-session-auto.sh +usr/lib/*/arctica-greeter/arctica-guest-session-setup.sh usr/share/lightdm/lightdm.conf.d/50-arctica-guest-wrapper.conf usr/share/arctica-greeter/guest-session/skel/.config/autostart/arctica-guest-session-startup.desktop
\ No newline at end of file diff --git a/po/POTFILES.in b/po/POTFILES.in index e634263..70cf321 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -24,3 +24,5 @@ src/toggle-box.vala src/arctica-greeter.vala src/user-list.vala src/user-prompt-box.vala +arctica-guest-account-script.sh.in +arctica-guest-session-auto.sh |