Raymond Toy pushed to branch issue-380-p2-clean-up-shell-scripts at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • bin/make-dist.sh
    ... ... @@ -63,6 +63,8 @@ def_arch_os () {
    63 63
     		GTAR=gtar ;;
    
    64 64
     	  esac
    
    65 65
     	  uname_r=$(uname -r)
    
    66
    +	  # shellcheck disable=SC2001
    
    67
    +	  # sed is ok here instead of shell variable pattern matching
    
    66 68
     	  case $uname_r in
    
    67 69
     	    5.*) rel=$(echo "$uname_r" | sed 's/5\.//') ;;
    
    68 70
     	    *) rel=$uname_r;;
    
    ... ... @@ -86,7 +88,9 @@ def_arch_os () {
    86 88
     	  ;;
    
    87 89
           FreeBSD)
    
    88 90
     	  ARCH=x86
    
    89
    -	  OS=freebsd_$(uname -r | tr '[:upper:]' '[:lower:]')
    
    91
    +	  # shellcheck disable=SC2018,SC2019
    
    92
    +	  # Don't want to use :lower: and :upper here since that depends on the locale.
    
    93
    +	  OS=freebsd_$(uname -r | tr 'A-Z' 'a-z')
    
    90 94
     	  ;;
    
    91 95
           esac
    
    92 96
     }
    
    ... ... @@ -159,6 +163,7 @@ if [ -z "$INSTALL_DIR" ]; then
    159 163
         fi
    
    160 164
     fi   
    
    161 165
     
    
    166
    +# shellcheck disable=SC2001
    
    162 167
     TARGET="$(echo "$1" | sed 's:/*$::')"
    
    163 168
     
    
    164 169
     # Choose a version based on the git hash as the default version.  We