Fix fix-macho fixture

Author: mxcl

bin/cmd/docker

@@ -36,7 +36,6 @@ if [ "$1" = --x86-64 ]; then
 fi
 
 if [ -z "$1" ]; then
-  echo "no command: launching interactive container" >&2
   INTERACTIVE="-it"
   CMD="/bin/bash"
 else

projects/fix-machos.com/package.yml

@@ -26,7 +26,14 @@ build:
 
     - cp {{deps.zlib.net.prefix}}/lib/libz.dylib '{{prefix}}/lib'
 
-    - run: install_name_tool -change @rpath/zlib.net/v{{deps.zlib.net.version}}/lib/libz.{{deps.zlib.net.version.marketing}}.dylib {{prefix}}/lib/libz.dylib fix-machos-test
+    # linker prefers to choose shorter versions apparently
+    - |
+      if test {{deps.zlib.net.version.patch}} = 0; then
+        ZLIB_VERSION={{deps.zlib.net.version.marketing}}
+      else
+        ZLIB_VERSION={{deps.zlib.net.version}}
+      fi
+    - run: install_name_tool -change @rpath/zlib.net/v{{deps.zlib.net.version}}/lib/libz.${ZLIB_VERSION}.dylib {{prefix}}/lib/libz.dylib fix-machos-test
       working-directory: '{{prefix}}/bin'
 
     - run: otool -l fix-machos-test