From e4852907fc35417c695eef75b2aba8bfb3dd1b83 Mon Sep 17 00:00:00 2001
From: Lance Pollard <lp@elk.fm>
Date: Mon, 22 Jan 2024 23:08:28 -0800
Subject: [PATCH] save

---
 .github/workflows/choco.yaml |  2 +-
 bump.choco.ts                |  4 ++--
 choco.json                   |  3 ---
 load/choco/task.nuspec       | 10 +++++-----
 package.json                 |  1 +
 5 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 choco.json

diff --git a/.github/workflows/choco.yaml b/.github/workflows/choco.yaml
index dd8ef10..614f228 100644
--- a/.github/workflows/choco.yaml
+++ b/.github/workflows/choco.yaml
@@ -27,7 +27,7 @@ jobs:
         run: choco config set cacheLocation "$($env:LOCALAPPDATA)\choco-cache"
       - name: Set ENV vars
         id: version
-        run: echo "PACKAGE_VERSION=$(cat choco.json | jq -r '.version')" >> $env:GITHUB_ENV
+        run: echo "PACKAGE_VERSION=$(cat package.json | jq -r '.chocoVersion')" >> $env:GITHUB_ENV
       - name: Choco pack
         run: choco pack load/choco/task.nuspec --out load/choco
       - name: DIR
diff --git a/bump.choco.ts b/bump.choco.ts
index 79ee51b..a437ce4 100644
--- a/bump.choco.ts
+++ b/bump.choco.ts
@@ -1,9 +1,9 @@
 import fs from 'fs'
-import pkg from 'choco.json'
+import pkg from 'package.json'
 
 const TOOL = `tool/chocolateyinstall.ps1`
 const SPEC = `load/choco/task.nuspec`
-const VERSION = pkg.version
+const VERSION = pkg.chocoVersion
 
 fs.writeFileSync(
   SPEC,
diff --git a/choco.json b/choco.json
deleted file mode 100644
index ca5c488..0000000
--- a/choco.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "version": "0.0.2"
-}
diff --git a/load/choco/task.nuspec b/load/choco/task.nuspec
index 54d63e1..f1ca585 100644
--- a/load/choco/task.nuspec
+++ b/load/choco/task.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>task</id>
     <title>task</title>
-    <version>0.0.2</version>
+    <version>0.0.4</version>
     <owners>Lance Pollard</owners>
     <authors>TermSurf</authors>
     <description>TermSurf Task Dependency Installation (Windows)</description>
@@ -12,10 +12,10 @@
     <packageSourceUrl>https://github.com/termsurf/task</packageSourceUrl>
     <projectUrl>https://github.com/termsurf/task</projectUrl>
     <dependencies>
-      <!-- <dependency id="libreoffice-fresh" />
-      <dependency id="imagemagick" /> -->
+      <dependency id="libreoffice-fresh" />
+      <dependency id="imagemagick" />
       <dependency id="fontforge" />
-      <!-- <dependency id="ffmpeg" />
+      <dependency id="ffmpeg" />
       <dependency id="miktex.install" />
       <dependency id="inkscape" />
       <dependency id="gifsicle" />
@@ -28,7 +28,7 @@
       <dependency id="maven" />
       <dependency id="llvm" />
       <dependency id="julia" />
-      <dependency id="pandoc" /> -->
+      <dependency id="pandoc" />
     </dependencies>
   </metadata>
 </package>
diff --git a/package.json b/package.json
index 4d31b78..5f3d64f 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "main": "./host/code/node/index.js",
   "browser": "./host/code/browser/index.js",
   "type": "module",
+  "chocoVersion": "0.0.4",
   "bin": {
     "task": "./host/code/cli/index.js"
   },