Bedre måte å vite array-størrelsen

[einar-bin] / middag.sh

diff --git a/middag.sh b/middag.sh
index 9f2b66b1a27bbe73d4f78d7c09d7aaf958603858..dbb0e14b15715a914e5cea058db617c33187a9d8 100755 (executable)
--- a/middag.sh
+++ b/middag.sh
@@ -24,28 +24,13 @@ Sides=(
  'salat'
 )
 
  'salat'
 )
 

-PrepCount=0
-while [ "x${Prep[PrepCount]}" != "x" ]; do
- ((PrepCount++))
-done
-
-MeatCount=0
-while [ "x${Meat[MeatCount]}" != "x" ]; do
- ((MeatCount++))
-done
-
-SideCount=0
-while [ "x${Sides[SideCount]}" != "x" ]; do
- ((SideCount++))
-done
-

 PrepN=$RANDOM
 PrepN=$RANDOM

-(( PrepN %= $PrepCount ))
+(( PrepN %= ${#Prep[@]} ))

 
 MeatN=$RANDOM
 
 MeatN=$RANDOM

-(( MeatN %= $MeatCount ))
+(( MeatN %= ${#Meat[@]} ))

 
 SideN=$RANDOM
 
 SideN=$RANDOM

-(( SideN %= $SideCount ))
+(( SideN %= ${#Sides[@]} ))

 
 echo "${Prep[PrepN]} ${Meat[MeatN]} med ${Sides[SideN]}"
 
 echo "${Prep[PrepN]} ${Meat[MeatN]} med ${Sides[SideN]}"