fix download url

39e946f2 · Jeffrey Morgan · 049295d9 · 39e946f2 · 39e946f2 · 39e946f2
Commit 39e946f2 authored Jul 07, 2023 by Jeffrey Morgan
11 changed files
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Run large language models with `llama.cpp`.

 ## Install

- [Download](https://github.com/jmorganca/ollama/releases/latest) for macOS
+- [Download](https://ollama.ai/download) for macOS
 - Download for Windows (coming soon)
 - Docker: `docker run -p 11434:11434 ollama/ollama`


--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -18,12 +18,16 @@ if ! git rev-parse v$VERSION >/dev/null 2>&1; then
  git push origin v$VERSION
 fi

+mkdir dist
+cp app/out/make/zip/${OS}/${ARCH}/Ollama-${OS}-${ARCH}-${VERSION}.zip dist/Ollama-${OS}-${ARCH}.zip
+cp ./ollama  dist/ollama-${OS}-${ARCH}
+
 # Create a new release.
 gh release create v$VERSION

 # Upload the zip file.
-gh release upload v$VERSION "app/out/make/zip/${OS}/${ARCH}/Ollama-${OS}-${ARCH}-${VERSION}.zip#Ollama-${OS}-${ARCH}.zip"
+gh release upload v$VERSION ./dist/Ollama-${OS}-${ARCH}.zip

 # Upload the binary.
-gh release upload v$VERSION "./ollama#ollama-${OS}-${ARCH}"
+gh release upload v$VERSION ./dist/ollama-${OS}-${ARCH}

--- a/web/app/download/page.tsx
+++ b/web/app/download/page.tsx
+import { Octokit } from '@octokit/rest'
+import { redirect } from 'next/navigation'
+
+const octokit = new Octokit()
+
+export default async function Download() {
+  const { data } = await octokit.repos.getLatestRelease({
+    owner: 'jmorganca',
+    repo: 'ollama',
+  })
+
+  // todo: get the correct asset for the current arch/os
+  const asset = data.assets.find(a => a.name.toLowerCase().includes('darwin') && a.name.toLowerCase().includes('.zip'))
+
+  if (asset) {
+    redirect(asset.browser_download_url)
+  }
+
+  return null
+}
--- a/web/app/icon.png
+++ b/web/app/icon.png
--- a/web/app/icon.svg
+++ b/web/app/icon.svg
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_202_1460)">
-<path d="M5.21875 16.125C5.21875 13.0156 6.20312 10.3906 8.17188 8.25C10.1562 6.09375 12.7031 5.01562 15.8125 5.01562C18.9062 5.01562 21.4688 6.03125 23.5 8.0625C25.5312 10.0938 26.5469 12.7969 26.5469 16.1719C26.5469 19.2812 25.5625 21.9844 23.5938 24.2812C21.625 26.5781 19.0781 27.7266 15.9531 27.7266C12.9531 27.7266 10.4141 26.625 8.33594 24.4219C6.25781 22.2188 5.21875 19.4531 5.21875 16.125ZM15.1562 6.42188C13.9219 6.42188 12.8516 6.82812 11.9453 7.64062C10.3828 9.0625 9.60156 11.5156 9.60156 15C9.60156 17.7812 10.2266 20.375 11.4766 22.7812C12.7422 25.1875 14.4922 26.3906 16.7266 26.3906C18.4766 26.3906 19.8203 25.5859 20.7578 23.9766C21.7109 22.3672 22.1875 20.2578 22.1875 17.6484C22.1875 14.9453 21.5859 12.3984 20.3828 10.0078C19.1797 7.61719 17.4375 6.42188 15.1562 6.42188Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_202_1460">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/web/app/page.tsx
+++ b/web/app/page.tsx
+import { AiFillApple } from 'react-icons/ai'
+
 import models from '../../models.json'

 export default async function Home() {
  return (
    <main className='flex min-h-screen max-w-2xl flex-col p-4 lg:p-24'>
-      <h1 className='font-serif text-3xl'>ollama</h1>
-      <section className='my-8'>
+      <img src='/ollama.png' className='w-20 h-auto' />
+      <section className='my-4'>
        <p className='my-3 max-w-md'>
          <a className='underline' href='https://github.com/jmorganca/ollama'>
            Ollama
          </a>{' '}
-          is a tool for running large language models. The latest version is available for download{' '}
-          <a className='underline' href='https://github.com/jmorganca/ollama/releases/latest'>
-            here.
+          is a tool for running large language models, currently for macOS with Windows and Linux coming soon.
+          <br />
+          <br />
+          <a href='/download'>
+            <button className='bg-black text-white text-sm py-2 px-3 rounded-lg flex items-center gap-2'>
+              <AiFillApple className='h-auto w-5 relative -top-px' /> Download for macOS
+            </button>
          </a>
        </p>
      </section>

--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -9,6 +9,7 @@
      "version": "0.0.0",
      "dependencies": {
        "@octokit/rest": "^19.0.13",
+        "@octokit/types": "^11.0.0",
        "@types/node": "20.4.0",
        "@types/react": "18.2.14",
        "@types/react-dom": "18.2.6",
@@ -20,6 +21,7 @@
        "postcss": "8.4.24",
        "react": "18.2.0",
        "react-dom": "18.2.0",
+        "react-icons": "^4.10.1",
        "semver": "^7.5.3",
        "tailwindcss": "3.3.2",
        "typescript": "5.1.6"
@@ -393,6 +395,14 @@
        "node": ">= 14"
      }
    },
+    "node_modules/@octokit/core/node_modules/@octokit/types": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
+      "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
    "node_modules/@octokit/endpoint": {
      "version": "7.0.6",
      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.6.tgz",
@@ -406,6 +416,14 @@
        "node": ">= 14"
      }
    },
+    "node_modules/@octokit/endpoint/node_modules/@octokit/types": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
+      "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
    "node_modules/@octokit/graphql": {
      "version": "5.0.6",
      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz",
@@ -419,6 +437,14 @@
        "node": ">= 14"
      }
    },
+    "node_modules/@octokit/graphql/node_modules/@octokit/types": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
+      "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
    "node_modules/@octokit/openapi-types": {
      "version": "18.0.0",
      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
@@ -439,6 +465,14 @@
        "@octokit/core": ">=4"
      }
    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
+      "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
    "node_modules/@octokit/plugin-request-log": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
@@ -498,6 +532,22 @@
        "node": ">= 14"
      }
    },
+    "node_modules/@octokit/request-error/node_modules/@octokit/types": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
+      "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
+    "node_modules/@octokit/request/node_modules/@octokit/types": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
+      "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
    "node_modules/@octokit/rest": {
      "version": "19.0.13",
      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.13.tgz",
@@ -518,9 +568,9 @@
      "integrity": "sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA=="
    },
    "node_modules/@octokit/types": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz",
-      "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-11.0.0.tgz",
+      "integrity": "sha512-h4iyfMpQUdub1itwTn6y7z2a3EtPuer1paKfsIbZErv0LBbZYGq6haiPUPJys/LetPqgcX3ft33O16XuS03Anw==",
      "dependencies": {
        "@octokit/openapi-types": "^18.0.0"
      }
@@ -3531,6 +3581,14 @@
        "react": "^18.2.0"
      }
    },
+    "node_modules/react-icons": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz",
+      "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==",
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
    "node_modules/react-is": {
      "version": "16.13.1",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",

--- a/web/package.json
+++ b/web/package.json
@@ -9,6 +9,7 @@
  },
  "dependencies": {
    "@octokit/rest": "^19.0.13",
+    "@octokit/types": "^11.0.0",
    "@types/node": "20.4.0",
    "@types/react": "18.2.14",
    "@types/react-dom": "18.2.6",
@@ -20,6 +21,7 @@
    "postcss": "8.4.24",
    "react": "18.2.0",
    "react-dom": "18.2.0",
+    "react-icons": "^4.10.1",
    "semver": "^7.5.3",
    "tailwindcss": "3.3.2",
    "typescript": "5.1.6"

--- a/web/public/next.svg
+++ b/web/public/next.svg
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
--- a/web/public/ollama.png
+++ b/web/public/ollama.png
--- a/web/public/vercel.svg
+++ b/web/public/vercel.svg
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
\ No newline at end of file