From acebda2da75326588aae52c8ec5c89e722e5d782 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Fri, 18 Aug 2017 21:11:13 +0000
Subject: [PATCH] Utilize the new common exec/unixstub.sh rather than the
 previous copy/pasta hack.

---
 xtrn/dpoker/dpoker | 37 +------------------------------------
 xtrn/sbj/sbj       | 37 +------------------------------------
 xtrn/sbj/sbjclean  | 37 +------------------------------------
 xtrn/sbl/sbl       | 37 +------------------------------------
 xtrn/sbl/sbl2smb   | 37 +------------------------------------
 xtrn/sbl/sblpack   | 37 +------------------------------------
 xtrn/sbl/smb2sbl   | 37 +------------------------------------
 xtrn/tbd/reroll    | 37 +------------------------------------
 xtrn/tbd/tbd       | 37 +------------------------------------
 9 files changed, 9 insertions(+), 324 deletions(-)

diff --git a/xtrn/dpoker/dpoker b/xtrn/dpoker/dpoker
index 769ba209eb..e7cb7a2236 100755
--- a/xtrn/dpoker/dpoker
+++ b/xtrn/dpoker/dpoker
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
diff --git a/xtrn/sbj/sbj b/xtrn/sbj/sbj
index 769ba209eb..e7cb7a2236 100755
--- a/xtrn/sbj/sbj
+++ b/xtrn/sbj/sbj
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
diff --git a/xtrn/sbj/sbjclean b/xtrn/sbj/sbjclean
index 2e07f954f9..e7cb7a2236 100755
--- a/xtrn/sbj/sbjclean
+++ b/xtrn/sbj/sbjclean
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep -v "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
diff --git a/xtrn/sbl/sbl b/xtrn/sbl/sbl
index a3f13fc234..e7cb7a2236 100755
--- a/xtrn/sbl/sbl
+++ b/xtrn/sbl/sbl
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-echo $os
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
diff --git a/xtrn/sbl/sbl2smb b/xtrn/sbl/sbl2smb
index 769ba209eb..e7cb7a2236 100755
--- a/xtrn/sbl/sbl2smb
+++ b/xtrn/sbl/sbl2smb
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
diff --git a/xtrn/sbl/sblpack b/xtrn/sbl/sblpack
index 769ba209eb..e7cb7a2236 100755
--- a/xtrn/sbl/sblpack
+++ b/xtrn/sbl/sblpack
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
diff --git a/xtrn/sbl/smb2sbl b/xtrn/sbl/smb2sbl
index 769ba209eb..e7cb7a2236 100755
--- a/xtrn/sbl/smb2sbl
+++ b/xtrn/sbl/smb2sbl
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
diff --git a/xtrn/tbd/reroll b/xtrn/tbd/reroll
index 769ba209eb..e7cb7a2236 100755
--- a/xtrn/tbd/reroll
+++ b/xtrn/tbd/reroll
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
diff --git a/xtrn/tbd/tbd b/xtrn/tbd/tbd
index 769ba209eb..e7cb7a2236 100755
--- a/xtrn/tbd/tbd
+++ b/xtrn/tbd/tbd
@@ -1,37 +1,2 @@
 #!/bin/sh
-os=`uname | tr "[A-Z]" "[a-z]"`
-if uname -m | egrep -v "(i[3456789]*|x)86" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if uname -m | egrep "64" > /dev/null
-	then
-	machine=`uname -m | tr "[A-Z]" "[a-z]" | tr " " "_"`
-fi
-if [ $machine = "x86_64" ]
-	then
-	machine=x64
-fi
-os=$os.$machine
-
-exename=`basename $0`
-dirname=`dirname $0`
-if [ -x $dirname\/gcc.$os.exe.release/$exename ]
-	then exec $dirname\/gcc.$os.exe.release/$exename $@
-elif [ -x $dirname\/gcc.$os.exe.debug/$exename ]
-	then exec $dirname\/gcc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/clang.$os.exe.release/$exename ]
-	then exec $dirname\/clang.$os.exe.release/$exename $@
-elif [ -x $dirname\/clang.$os.exe.debug/$exename ]
-	then exec $dirname\/clang.$os.exe.debug/$exename $@
-elif [ -x $dirname\/icc.$os.exe.release/$exename ]
-	then exec $dirname\/icc.$os.exe.release/$exename $@
-elif [ -x $dirname\/icc.$os.exe.debug/$exename ]
-	then exec $dirname\/icc.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.release/$exename ]
-	then exec $dirname\/*.$os.exe.release/$exename $@
-elif [ -x $dirname\/*.$os.exe.debug/$exename ]
-	then exec $dirname\/*.$os.exe.debug/$exename $@
-elif [ -x $dirname\/*.$os.exe.*/$exename ]
-	then exec $dirname\/*.$os.exe.*/$exename $@
-fi
+. ${SBBSEXEC}unixstub.sh
-- 
GitLab