[debian-edu-commits] debian-edu/ 112/183: - Add psh fix, - move zoidberg fix, zoidberg now allows to automatically add the fix

[Alexander Alemayhu]

This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.

commit 9bdd2d9fa1d419e7f44bc5c8feaed221df9a6d42
Author: Bart Cornelis <cobaco at linux.be>
Date:   Mon Feb 20 11:36:05 2006 +0000

    - Add psh fix,
    - move zoidberg fix, zoidberg now allows to automatically add the fix
---
 README                                       | 22 ++++++++-----------
 debian/changelog                             |  9 ++++++++
 debian/rules                                 |  4 +++-
 desktop-profiles_pshrc.pl                    | 32 ++++++++++++++++++++++++++++
 zoidrc-snippet => desktop-profiles_zoidrc.pl |  0
 5 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/README b/README
index 079ec07..be0b66d 100644
--- a/README
+++ b/README
@@ -20,12 +20,11 @@ KNOWN BUGS
   on-logon script of each shell run the profile activation script when an 
   'ssh-X' login is detected. 
   This package currently documents the necessary bits of code for the following
-  shells: bash, dash, ksh, pdksh, mksh, csh, tcsh, zsh, zoidberg, and fish. 
-  Only the fish on-logon script allows is currently modularized, thus allowing 
-  the fix to applied automatically, users of other shells need to add in the 
-  required code by hand.
-  Fixes for psh and slsh are currently missing (if anybody is able to lend a
-  hand please do as I'm not familiar with either).
+  shells: bash, dash, ksh, pdksh, mksh, csh, tcsh, zsh, zoidberg, fish and psh. 
+  Where possible the fix is applied automatically (this needs a modularized 
+  on-logon script), otherwise the admin needs to add the required code by hand.
+  A Fix for slsh is still missing (if anybody is able to lend a hand please do
+  as I'm not familiar with S-lang).
 
   For bourne-compatible shells (bash, dash, ksh, pdksh, mksh) the system-wide 
   on-logon script is /etc/profile. The file 
@@ -40,13 +39,10 @@ KNOWN BUGS
   /usr/share/doc/desktop-profiles/examples/zlogin-snippet contains the
   code-snippet that needs to be added to it in order to fix this bug.
 
-  For the zoidberg shell the system-wide on-logon script is /etc/zoidrc. The 
-  file /usr/share/doc/desktop-profiles/examples/zoidrc-snippet contains the 
-  code-snippet that needs to be added to it in order to fix this bug.
-
-  Users of the fish shell don't need to do anything as the system-wide on-logon
-  script of fish is modularized. The required code-snippet is dropped into place
-  automatically by the package.
+  Users of the fish, psh (>=1.8-6) and zoidberg (>= 0.96-1) shells don't need to
+  do anything as the system-wide on-logon script of these shells is modularized,
+  and thus allows the required code-snippet to be dropped into place on package
+  installation.
   
 GETTING GCONF PROFILES TO WORK
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/debian/changelog b/debian/changelog
index cf90783..4730c06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+desktop-profiles (1.4.11) UNRELEASED; urgency=low
+
+  * Added shell-specific fix for the 'ssh -X' bug for psh shell (applied
+    automatically as /etc/pshrc is modularized starting from version 1.8-6)
+  * Zoidberg 0.96-1 modularized /etc/zoidrc, so we now apply the 'ssh -X'
+    fix automatically.
+
+ -- Bart Cornelis (cobaco) <cobaco at linux.be>  Sun, 19 Feb 2006 21:45:25 +0100
+
 desktop-profiles (1.4.10) unstable; urgency=low
 
   * Translations:
diff --git a/debian/rules b/debian/rules
index e6875bd..108ba33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,11 +41,13 @@ binary-indep: build install
 	dh_install dh_installlisting profile-manager usr/bin
 	dh_install listingmodule get_desktop-profiles_variables path usr/share/desktop-profiles/
 	dh_link usr/share/desktop-profiles/path usr/share/doc/desktop-profiles/examples/path
-	dh_install profile-snippet csh.login-snippet zlogin-snippet zoidrc-snippet usr/share/doc/desktop-profiles/examples
+	dh_install profile-snippet csh.login-snippet zlogin-snippet usr/share/doc/desktop-profiles/examples
 	dh_install list-desktop-profiles usr/bin/
 	dh_install profile-manager.kmdr usr/share/desktop-profiles/kommander-scripts/
 	dh_install desktop-profiles etc/default
 	dh_install desktop-profiles.fish etc/fish.d/
+	dh_install desktop-profiles_pshrc.pl etc/pshrc.d/
+	dh_install desktop-profiles_zoidrc.pl etc/zoidrc.d/
 	dh_install 20desktop-profiles_activateDesktopProfiles etc/X11/Xsession.d/
 	dh_install path2listing usr/sbin
 	./dh_installlisting
diff --git a/desktop-profiles_pshrc.pl b/desktop-profiles_pshrc.pl
new file mode 100755
index 0000000..7c22740
--- /dev/null
+++ b/desktop-profiles_pshrc.pl
@@ -0,0 +1,32 @@
+#!/usr/bin/perl
+
+# This fixes the desktop-profiles corner-case where a graphical client is 
+# started through an 'ssh -X' session in which the Xsession.d scripts are 
+# not run, so we need to make sure the profiles are activated according to
+# the specified settings at login).
+$DESKTOP_PROFILES_SNIPPET = '/usr/share/desktop-profiles/get_desktop-profiles_variables';
+
+if ( -e $DESKTOP_PROFILES_SNIPPET ) {
+  $TEMP_FILE = `tempfile`;
+
+  # get rid of extranous newline, which messed things up later
+  { $TEMP_FILE =~ s/\n// }
+
+  # use bash to write the required environment settings to a tempfile
+  # this file has a 'VARIABLE=VALUE' format
+  `bash $DESKTOP_PROFILES_SNIPPET $TEMP_FILE`;
+
+  # source to set the required environment variables
+  # needs to become: $ENV{'VARIABLE'} = 'VALUE'; 
+  {
+    open(input, $TEMP_FILE);
+    while($env_var = <input>) {
+      # needs to become: $ENV{'VARIABLE'} = 'VALUE'; 
+      $env_var =~ s/^(.*)=(.*)$/\\\\$ENV{'\1'} = '\2'/ ;
+      eval $env_var;
+    }
+  }
+  
+  # cleanup
+  `rm $TEMP_FILE`;
+}
diff --git a/zoidrc-snippet b/desktop-profiles_zoidrc.pl
similarity index 100%
rename from zoidrc-snippet
rename to desktop-profiles_zoidrc.pl

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git