From 89f8903bc5b942211c95e3a1dfdf1d030be8596d Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Mon, 30 Sep 2013 23:29:44 +0200
Subject: portability
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 gotrc-examples/allow-uppercase    | 8 ++++----
 gotrc-examples/commands           | 2 +-
 gotrc-examples/issue-file         | 2 +-
 gotrc-examples/lower-left-ponysay | 9 +++++----
 gotrc-examples/no-empty-user      | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'gotrc-examples')

diff --git a/gotrc-examples/allow-uppercase b/gotrc-examples/allow-uppercase
index a54c5f6..aa13d07 100644
--- a/gotrc-examples/allow-uppercase
+++ b/gotrc-examples/allow-uppercase
@@ -6,17 +6,17 @@
 read_function_allow_uppercase=$read_function
 read_function=_read_allow_uppercase
 
-function _read_allow_uppercase
+_read_allow_uppercase ()
 {
     $read_function_allow_uppercase
     lower=""
     for word in $user; do
-	if [ ! "${word::1}" = "-" ]; then # this check is done so ssh arguments are not made into lower case
-	    word="$(sed -e 'y/QWERTYUIOPASDFGHJKLZXCVBNM/qwertyuiopasdfghjklzxcvbnm/' <<< "${word}")"
+	if [ ! "${word%%-*}" = "" ]; then # This check is done so SSH arguments are not made into lower case
+	    word="$(echo "${word}" | sed -e 'y/QWERTYUIOPASDFGHJKLZXCVBNM/qwertyuiopasdfghjklzxcvbnm/')"
 	fi
 	lower="${lower} ${word}"
     done
-    lower="${lower:1}"
+    lower="${lower# *}"
     if [ ! "${lower}" = "${user}" ]; then
 	#stty olcuc ## Uncomment this if you want to go old-school Unix, too bad
 	            ## it will break colours and only uppercases ASCII letters.
diff --git a/gotrc-examples/commands b/gotrc-examples/commands
index 1a98b07..6c382bf 100644
--- a/gotrc-examples/commands
+++ b/gotrc-examples/commands
@@ -8,7 +8,7 @@ login_function=_login_commands
 
 function _login_commands
 {
-    if [ "${user::1}" = "+" ]; then
+    if [ "${user%%+*}" = "" ]; then
 	if [ "${user}" = "+shutdown" ]; then
 	    shutdown -h now
 	elif [ "${user}" = "+reboot" ]; then
diff --git a/gotrc-examples/issue-file b/gotrc-examples/issue-file
index 85cc442..9f973e8 100644
--- a/gotrc-examples/issue-file
+++ b/gotrc-examples/issue-file
@@ -4,7 +4,7 @@
 # only partially implemented, but also extended
 
 
-function _display
+_display ()
 {
     python3 <<EOF
 buf = "\\033[H\\033[2J"
diff --git a/gotrc-examples/lower-left-ponysay b/gotrc-examples/lower-left-ponysay
index 563790d..686535a 100644
--- a/gotrc-examples/lower-left-ponysay
+++ b/gotrc-examples/lower-left-ponysay
@@ -7,14 +7,15 @@
 
 function _display
 {
-    PALETTE=$'\e]P0020840\e]P1CD656C\e]P232A679\e]P3CCAD47\e]P42495BE\e]P5A46EB0\e]P600A09F\e]P7D3D7CF\e]P8555753\e]P9EB5E6A\e]PA0EC287\e]PBF2CA38\e]PC00ACE0\e]PDC473D1\e]PE00C3C7\e]PFEEEEEE'
+    PALETTE=$(echo -e '\e]P0020840\e]P1CD656C\e]P232A679\e]P3CCAD47\e]P42495BE\e]P5A46EB0\e]P600A09F\e]P7D3D7CF\e]P8555753\e]P9EB5E6A\e]PA0EC287\e]PBF2CA38\e]PC00ACE0\e]PDC473D1\e]PE00C3C7\e]PFEEEEEE')
     echo -n "${PALETTE}"
     echo -en '\e[H\e[2J\e[?8c'
     pony="$(PONYSAY_SHELL_LINES=5 PONYSAY_KMS_PALETTE="${PALETTE}" ponysay -o <&2)"
-    lines=$(wc -l <<< "${pony}")
+    lines=$(echo "${pony}" | wc -l)
     height=$(stty size | cut -d ' ' -f 1)
-    echo -n $'\e['"$(( $height - $lines + 1 ));1H$(sed -e 's:\x1b\[H\x1b\[2J::' <<< "${pony}")${PALETTE}"$'\e[H'
-    echo -e "\e[${ANSI_COLOR}m${NAME} (${tty})\e[00m"
+    echo -en $'\e['"$(( $height - $lines + 1 ));1H"
+    echo -n "$(echo "${pony}" | sed -e 's:\x1b\[H\x1b\[2J::')${PALETTE}"
+    echo -e "\e[H\e[${ANSI_COLOR}m${NAME} (${tty})\e[00m"
     echo 
     echo -n 'Login: '
 }
diff --git a/gotrc-examples/no-empty-user b/gotrc-examples/no-empty-user
index f398f65..f218c0f 100644
--- a/gotrc-examples/no-empty-user
+++ b/gotrc-examples/no-empty-user
@@ -6,7 +6,7 @@
 read_function_no_empty_user=$read_function
 read_function=_read_no_empty_user
 
-function _read_no_empty_user
+_read_no_empty_user ()
 {
     $read_function_no_empty_user
     if [ "${lower}" = "" ]; then
-- 
cgit v1.2.3-70-g09d2