Tweak: Better supported syntax for URI on Linux

[einar-bin] / imgurgame.bash

diff --git a/imgurgame.bash b/imgurgame.bash
index d1f9fdd4688594de2bccd1dce5689d2e746d1550..a30b02d5662ea45844dcb5897c1ddb9c2bfa2ea8 100755 (executable)
--- a/imgurgame.bash
+++ b/imgurgame.bash
@@ -5,16 +5,20 @@ readonly BROWSER="google-chrome"
 
 # Create a random imgur url that may or may not be valid
 imgururl() {
 
 # Create a random imgur url that may or may not be valid
 imgururl() {

-  # 1/3% chance for length of 5, 6 or 7 length string
-  STRLN=$((5 + ${RANDOM} % 3))
-  local ID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${STRLN} | head -n 1)
+  # 1/3 chance for length of 5, 6 or 7 length string
+  STRLN=$((5 + RANDOM % 3))
+  local ID
+  # don't nag about useless cat, this is more readable
+  # shellcheck disable=2002
+  ID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${STRLN} | head -n 1)

   echo "http://i.imgur.com/${ID}.jpg"
 }
 
 # Test if we found a valid URL
 testimgur() {
   local URL=${1}
   echo "http://i.imgur.com/${ID}.jpg"
 }
 
 # Test if we found a valid URL
 testimgur() {
   local URL=${1}

-  local RESULT=$(curl -s -o /dev/null -I -w "%{http_code}" ${URL})
+  local RESULT
+  RESULT=$(curl -s -o /dev/null -I -w "%{http_code}" "${URL}")

   if [[ ${RESULT} == "200" ]]; then
     echo true
   else
   if [[ ${RESULT} == "200" ]]; then
     echo true
   else


@@ -25,10 +29,11 @@ testimgur() {
 main() {
   local FAIL=0
   while true; do
 main() {
   local FAIL=0
   while true; do

-    local URL=$(imgururl)
-    if [[ $(testimgur ${URL}) == "true" ]]; then
+    local URL
+    URL=$(imgururl)
+    if [[ $(testimgur "${URL}") == "true" ]]; then

       echo "Found ${URL} after ${FAIL} failed tries"
       echo "Found ${URL} after ${FAIL} failed tries"

-      ${BROWSER} ${URL} > /dev/null 2>&1
+      ${BROWSER} "${URL}" > /dev/null 2>&1

       local FAIL=0
     else
       ((FAIL++))
       local FAIL=0
     else
       ((FAIL++))