1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
|
From: Ryan Tandy <ryan@nardis.ca>
Date: Sun, 15 Apr 2012 00:02:54 -0700
Subject: bashisms
---
files/micro-evtd.event | 8 ++++----
files/microapl | 40 ++++++++++++++++++++--------------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/files/micro-evtd.event b/files/micro-evtd.event
index bf58449..e21c96c 100644
--- a/files/micro-evtd.event
+++ b/files/micro-evtd.event
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# micro-evtd Event Script
#
# Sample Event Script written by Bob Perry (2007-2009)
@@ -60,8 +60,8 @@ over_heat() {
dump_info() {
## Temp and fan speed info
- let "rpm = $2 * 30"
- echo -e "Temp=$1[C-Deg]\nFan=${rpm}rpm\nFan Failures=$3" > $TMP/micro-evtd.status
+ rpm=$(($2*30))
+ printf "Temp=$1[C-Deg]\nFan=${rpm}rpm\nFan Failures=$3\n" > $TMP/micro-evtd.status
}
stop() {
@@ -158,7 +158,7 @@ look() {
case "$1" in
4) fan_fault $2 ;;
O) over_heat $2 ;;
- I) dump_info $2 $3 ${4//_/ } ;;
+ I) dump_info $2 $3 $(echo $4 | tr -d _) ;;
B) button $2 $4;;
W) message $2 ;;
S) standby $2 $3 ;;
diff --git a/files/microapl b/files/microapl
index 6be140a..80ad001 100644
--- a/files/microapl
+++ b/files/microapl
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# microapl Linkstation/Kuro Micro-Controller querry script
#
@@ -76,15 +76,15 @@ parse()
## Delay amount?
if [ "$2" != "" ] ; then
## We only do 5 mins intervals
- ((COUNT=($2+4)/5))
+ COUNT=$((($2+4)/5))
fi
LOOP=0
DELAY=0
while [ ${LOOP} -lt ${COUNT} ] ; do
- ((DELAY +=5))
- ((LOOP ++))
+ DELAY=$(($DELAY+5))
+ LOOP=$(($LOOP+1))
/bin/kill -SIGCONT ${PID}
- LC=0 ; while [ ${LC} -lt 50 ] ;do ((LC ++)) ; done
+ LC=0 ; while [ ${LC} -lt 50 ] ;do LC=$((LC+1)) ; done
done
echo "Standby delayed by additional ${DELAY} minutes"
else
@@ -110,7 +110,7 @@ parse()
system_get_mode)
$MICRO 8034 ;;
system_set_watchdog)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
TEMP=`$MICRO 8035`
TEMP=`expr 255 - ${TEMP}`
echo "#[microapl.system_set_watchdog]"
@@ -133,7 +133,7 @@ parse()
echo "#[microapl.temp_get]"
echo "temp="${TEMP}"[C-degs]" ;;
fan_set_speed)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
echo "#[microapl.fan_set_speed]"
echo -n "fan_set_speed="
case `$MICRO 8033` in
@@ -169,7 +169,7 @@ parse()
*) $MICRO_q 013000 ;;
esac ;;
bz_set_freq)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
echo "#[microapl.bz_set_freq]"
echo "bz_set_freq="`$MICRO 8053`
else
@@ -184,7 +184,7 @@ parse()
$MICRO_q 0253${TEMP}${TEMP2}
fi ;;
bz_imhere)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
echo "please specify tempo and note(s)"
else
TIME="$(($2 / 1000)).$(printf '%03d' $(($2 % 1000)))"
@@ -210,7 +210,7 @@ parse()
parse led_set_cpu_mcon 0
fi ;;
bz_melody)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
echo "please specify tempo and note(s)"
else
TIME="$(($2 / 1000)).$(printf '%03d' $(($2 % 1000)))"
@@ -235,7 +235,7 @@ parse()
esac
;;
led_set_bright)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
TEMP=`$MICRO 803A`
TEMP="$((${TEMP} & 0xF))"
case "${TEMP}" in
@@ -292,7 +292,7 @@ parse()
led_set_blink | \
led_set_brink) COMMAND=52 ; SET="on"; UNSET="off" ;;
esac
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
echo "#[microapl.$1]"
TEMP=`$MICRO 80${COMMAND}`
# extract first element
@@ -318,7 +318,7 @@ parse()
$MICRO_q 02${COMMAND}${TEMP}00
fi ;;
led_set_code_error)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
TEMP=`$MICRO 8054`
TEMP="${TEMP##* }"
echo "#[microapl.led_set_code_error]"
@@ -346,7 +346,7 @@ parse()
$MICRO_q 0254${TEMP}${ARG}
fi ;;
led_set_code_information)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
TEMP=`$MICRO 8054`
TEMP="${TEMP%% *}"
TEMP="$(printf '%02X' ${TEMP})"
@@ -374,7 +374,7 @@ parse()
mcon_get_status)
echo "#[microapl.mcon_get_status]"
echo -n "mcon_status="
- if [ `$MICRO 803C` == "32" ] ; then
+ if [ `$MICRO 803C` = "32" ] ; then
echo "on"
else
echo "off"
@@ -384,7 +384,7 @@ parse()
echo "#[microapl.mcon_get_version]"
echo -n "mcon_version="
TEMP=`$MICRO 8083`
- if [ "${TEMP}" == -1 ] ; then
+ if [ "${TEMP}" = -1 ] ; then
echo "(error while getting version)"
else
for i in ${TEMP} ; do
@@ -394,12 +394,12 @@ parse()
fi
;;
hdd_set_power)
- if [ "$2" == "" ] ; then
+ if [ "$2" = "" ] ; then
echo "#[microapl.hdd_set_power]"
case `$MICRO 803B` in
- 0) echo -e "hdd12_power=off\nhdd34_power=off" ;;
- 1) echo -e "hdd12_power=on\nhdd34_power=off" ;;
- 2) echo -e "hdd12_power=off\nhdd34_power=on" ;;
+ 0) printf "hdd12_power=off\nhdd34_power=off\n" ;;
+ 1) printf "hdd12_power=on\nhdd34_power=off\n" ;;
+ 2) printf "hdd12_power=off\nhdd34_power=on\n" ;;
esac
else
TEMP=`printf "0x%02X" $2`
|