Ticket #9603: trac_9603-iconv_spkg-optional_second_reviewer.patch

SPKG.txt

@@ -48 +48 @@
    Developers Guide.
  * Consistently use "$UNAME" (which is set by 'sage-env') rather than
    `uname`. (Reviewer change. Also further cosmetic changes.)
+ * Stylistic change: Use 'case' statements for $UNAME case distinctions
+   rather than (nested) 'if's with or-lists of 'test' statements.
+   (Reviewer change, too.)
  * All patches/changes made at #9603.
 
 === iconv-1.13.1.p2 (John Palmieri, March 31st 2010) ===

spkg-check

@@ -9 +9 @@
 # platforms on which the iconv shipped with Sage will be installed. On
 # other platforms Sage uses the system's iconv.
 
-if [ "x$UNAME" = xSunOS ] || [ "x$UNAME" = xCYGWIN ] || [ "x$UNAME" = xHP-UX ]; then
+case "$UNAME" in
+SunOS)
     # We must test iconv, but on Solaris some tests will always fail.
-    if [ "x$UNAME" = xSunOS ]; then 
-        echo "If you see 3 core dumps, do not be too alarmed."
-        echo "This is a known Solaris bug and can safely be ignored."
-        echo "See http://trac.sagemath.org/sage_trac/ticket/8270"
-        echo "It will probably be fixed in later releases of Solaris 10,"
-        echo "and was fixed in build 66 of OpenSolaris:"
-        echo "http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6550204"
-    fi
+    echo "If you see 3 core dumps, don't be too alarmed."
+    echo "This is a known Solaris bug and can safely be ignored. See"
+    echo "    http://trac.sagemath.org/sage_trac/ticket/8270"
+    echo "It will probably be fixed in later releases of Solaris 10,"
+    echo "and was fixed in build 66 of OpenSolaris:"
+    echo "    http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6550204"
+    ;&
+CYGWIN|HP-UX)
 
     cd src
 
@@ -30 +31 @@
     fi
     echo "All the tests for iconv passed."
     exit 0
-else
+    ;;
+*) # Not CYGWIN, HP-UX or SunOS (Solaris)
     echo "iconv was not to be tested, since Sage will use the system's iconv"
     echo "and not the one shipped with Sage."
     echo "The iconv supplied by Sage is only used on Cygwin, HP-UX and Solaris."
     exit 0
-fi
+esac
 
 # NOT REACHED
 

spkg-install

@@ -11 +11 @@
 #     http://trac.sagemath.org/sage_trac/ticket/9603
 # for details.
 
-if [ "x$UNAME" = xSunOS ] || [ "x$UNAME" = xHP-UX ] || [ "x$UNAME" = xCYGWIN ];
-then
+case "$UNAME" in
+CYGWIN|HP-UX|SunOS)
     echo "iconv will be installed as the operating system is Cygwin, HP-UX or Solaris."
     echo "These systems either lack iconv, or do not have a sufficiently capable"
     echo "version of iconv. See:"
@@ -56 +56 @@
         exit 1
     fi
     exit 0
-else
+    ;;
+*)  # Not CYGWIN, HP-UX or SunOS (Solaris)
     echo "iconv will not be installed, as we only need to build it on"
     echo "Solaris, HP-UX and Cygwin, as the system's iconv will be used"
     echo "on other platforms, rather than the one shipped with Sage."
@@ -64 +65 @@
     echo "    http://trac.sagemath.org/sage_trac/ticket/8567"
     echo "    http://trac.sagemath.org/sage_trac/ticket/9603"
     exit 0
-fi
+esac
 
 # NOT REACHED