[Jifty-commit] r5089 - talks/talks

[Jifty commits]

Author: sartak
Date: Sun Feb 10 22:01:48 2008
New Revision: 5089

Modified:
   talks/talks/present-slides

Log:
Some minor fixes to present-slides
### this is now a comment
You can change mode to any \S+

Modified: talks/talks/present-slides
==============================================================================
--- talks/talks/present-slides	(original)
+++ talks/talks/present-slides	Sun Feb 10 22:01:48 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 use warnings;
 use strict;
@@ -17,7 +17,7 @@
 $| = 1;
 select(STDOUT);
 
-my $cmd = q{ osascript -e ' tell application "Terminal"' -e ' do script "tail -f /tmp/next_slide"' -e 'end tell' };
+my $cmd = q{ osascript -e ' tell application "Terminal"' -e ' do script " tail -f /tmp/next_slide"' -e 'end tell' };
 system($cmd);
 while ( $counter <= $#SLIDES ) {
     my $translation = '';
@@ -40,6 +40,10 @@
     my $console = Term::ANSIScreen->new;
     $console->Cls;
     $console->Cursor(1,1);
+
+    # comments
+    $slide =~ s/^### .*$//gm;
+
     if ( $slide =~ s/^#\s*title\s*?(.*?)$//gm ) {
         $title = $1;
     }
@@ -59,13 +63,15 @@
 	`$cmd>/dev/null 2>/dev/null &`;
 	$slides_played->{$counter}++}
     }
-    if ( $slide =~ s/#\s*mode.*?(perl|ruby).*?$//gms ) {
+
+    if ( $slide =~ s/#\s*mode\s*(\S+)\s*$//gms ) {
         $mode = $1;
     }
+
     if ( $mode eq 'text' and $slide ) {
         $slide = autoformat $slide, { left => 2, right => ($cols-1), all => 1 };
     }
-    elsif ($mode =~ /(?:perl|ruby)/) {
+    else {
 	$slide =~ s/^/ /gsm;
 	my $tidycols = $cols - 2; # squeeze for display
 	open my $out , ">/tmp/output.$$" || die $!;
@@ -107,7 +113,7 @@
     if ( $key =~ /^(?: |\n|n)/ ) {
         $counter++;
     } elsif ( $key eq 'e' ) {
-	system("vim", $ARGV[0]);
+	system($ENV{EDITOR}||"vim", $ARGV[0]);
 	load_slides();
 	next;
     } elsif ( $key eq 'r' ) {