From f9194a644d39ff0e350aa4748beaabec550220cc Mon Sep 17 00:00:00 2001 From: Scott Bonds Date: Thu, 3 Aug 2017 08:08:14 -0700 Subject: [PATCH] Add OpenBSD support to shebang script * use sha1 instead of sha1sum on OpenBSD * enable using runidris regardless of the script's extension * mark runidris scripts executable --- scripts/runidris | 11 +++++++++-- scripts/runidris-node | 15 +++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) mode change 100644 => 100755 scripts/runidris mode change 100644 => 100755 scripts/runidris-node diff --git a/scripts/runidris b/scripts/runidris old mode 100644 new mode 100755 index 3f2196383..ea1ef559c --- a/scripts/runidris +++ b/scripts/runidris @@ -9,10 +9,17 @@ if [ ! -d $RUNIDRIS_DIR ]; then mkdir $RUNIDRIS_DIR chmod 700 $RUNIDRIS_DIR fi -TEMP_NAME="runidris-`sha1sum $1 | cut -c1-40`" + +OS=`uname -s` +case $OS in + OpenBSD ) TEMP_NAME="runidris-`sha1 -q $1`" ;; + * ) TEMP_NAME="runidris-`sha1sum $1 | cut -c1-40`" ;; +esac + FP="$RUNIDRIS_DIR/$TEMP_NAME" +cp "$1" "$FP.idr" # idris won't compile the script unless it ends in .idr if [ ! -e $FP ]; then - "${IDRIS:-idris}" $1 --ibcsubdir "$RUNIDRIS_DIR" -i "." -o $FP + "${IDRIS:-idris}" "$FP.idr" --ibcsubdir "$RUNIDRIS_DIR" -i "." -o $FP fi shift "$FP" "$@" diff --git a/scripts/runidris-node b/scripts/runidris-node old mode 100644 new mode 100755 index 1adaa8497..c3572fff2 --- a/scripts/runidris-node +++ b/scripts/runidris-node @@ -9,10 +9,17 @@ if [ ! -d $RUNIDRIS_DIR ]; then mkdir $RUNIDRIS_DIR chmod 700 $RUNIDRIS_DIR fi -TEMP_NAME="runidris-`sha1sum $1 | cut -c1-40`.js" + +OS=`uname -s` +case $OS in + OpenBSD ) TEMP_NAME="runidris-`sha1 -q $1`" ;; + * ) TEMP_NAME="runidris-`sha1sum $1 | cut -c1-40`" ;; +esac + FP="$RUNIDRIS_DIR/$TEMP_NAME" -if [ ! -e $FP ]; then - "${IDRIS:-idris}" --codegen node --ibcsubdir "$RUNIDRIS_DIR" -i "." $1 -o $FP +cp "$1" "$FP.idr" # idris won't compile the script unless it ends in .idr +if [ ! -e "$FP.js" ]; then + "${IDRIS:-idris}" --codegen node --ibcsubdir "$RUNIDRIS_DIR" -i "." "$FP.idr" -o "$FP.js" fi shift -node "$FP" "$@" +node "$FP.js" "$@"