[Pkg-jed-commit] r240 - trunk/packages/jed/debian

[Guenter Milde]

Author: milde-guest
Date: 2005-12-13 14:13:00 +0000 (Tue, 13 Dec 2005)
New Revision: 240

Modified:
   trunk/packages/jed/debian/defaults.sl
Log:
bugfix: let --skip-debian-startup really skip the evaluation of jed.d/


Modified: trunk/packages/jed/debian/defaults.sl
===================================================================
--- trunk/packages/jed/debian/defaults.sl	2005-12-13 13:08:29 UTC (rev 239)
+++ trunk/packages/jed/debian/defaults.sl	2005-12-13 14:13:00 UTC (rev 240)
@@ -9,19 +9,18 @@
 %  Copyright (c) 2005 The Debian Jed Maintainers Group
 %  Released under the terms of the GNU General Public License (ver. 2 or later)
 
-private variable skip;
+% dummy function, enables skipping the startup procecure from the command line
+% with `jed --skip-debian-startup`
+define skip_debian_startup() {}
 
-% do not evaluate if jed is started as jed-script
-skip = (BATCH == 2); 
-
-% enable skipping the startup procecure from the command line with
-% jed --skip-debian-startup
-define skip_debian_startup()
-{
-   skip = 1;
-}
-
-if (not(skip)) { 
+if (andelse
+   % skip startup scripts if jed is started as `jed-script`
+   {BATCH != 2}
+   % skip startup scripts if jed is started with --skip-debian-startup
+   {not(length(where(__argv == "--skip-debian-startup")))}
+   )
+{ 
+   show("hi");
     $1 = listdir("/etc/jed.d/");
     foreach ( $1[ array_sort($1) ] ) {
         $1 = ();