From 452975ad03e5e34928d1856d8b34df7fda5e35e4 Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Fri, 23 Jun 2017 12:02:52 -0500
Subject: [PATCH] tolerate encoding line after shebang
---
ShellB3/sbin/re-l | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/ShellB3/sbin/re-l b/ShellB3/sbin/re-l
index 20d747e1..17ed5c7d 100755
--- a/ShellB3/sbin/re-l
+++ b/ShellB3/sbin/re-l
@@ -55,9 +55,13 @@ def isRelScript(filepath):
return getLine(filepath,linenumber=1)=='#!/usr/bin/env re-l'
def extractRelInterpreter(filepath):
- l=getLine(filepath,linenumber=2)
- assert(l.startswith('#:'))
- return l.split(':',1)[1].strip()
+ if not isRelScript(filepath):
+ raise RuntimeError("Not a re-l script!")
+ for line in range(2,5):
+ l=getLine(filepath,linenumber=line)
+ if l.startswith(('#re-l:','#:')):
+ return l.split(':',1)[1].strip()
+ raise RuntimeError("Couldn't find re-lative interpreter line (starts with '#re-l:')")
def relexec(interpreter,scriptfile,*_args):
args=[None,None]+list(_args)
--
GitLab