Merge pull request #72 from ful1e5/dev

v1.2.3: macOSMonterey cursor (sharp tail cursors)
ful1e5 · Nov 23, 2021 · 24c27a2 · 24c27a2
2 parents c043b0e + bdbbbd9
commit 24c27a2
Show file tree

Hide file tree

Showing 63 changed files with 508 additions and 60 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,41 +53,71 @@ jobs:
         with:
           python-version: "3.8"
 
-      - name: Generating `macOSBigSur` Cursor Theme
-        run: make bigsur
+      - name: Generating `macOSMonterey` symlinks
+        run: cd svg && python link.py && cd ..
         continue-on-error: false
 
-      - name: Compressing UNIX theme
+      - name: Generating `macOS` Cursor Theme
+        run: make
+        continue-on-error: false
+
+      - name: Compressing `macOS` UNIX themes
         run: |
           tar -cvzf macOSBigSur.tar.gz themes/macOSBigSur
           tar -cvzf macOSBigSur-White.tar.gz themes/macOSBigSur-White
+          tar -cvzf macOSMonterey.tar.gz themes/macOSMonterey
+          tar -cvzf macOSMonterey-White.tar.gz themes/macOSMonterey-White
 
-      - name: Uploading `bitmaps` artifact
+      - name: Uploading `macOSBigSur` bitmaps
         uses: actions/upload-artifact@v2
         with:
           name: bitmaps
           path: bitmaps/*
 
-      - name: Uploading `macOSBigSur` UNIX Theme artifact
+      - name: Uploading `macOSBigSur` UNIX Theme
         uses: actions/upload-artifact@v2
         with:
           name: macOSBigSur
           path: macOSBigSur.tar.gz
 
-      - name: Uploading `macOSBigSur-White` UNIX Theme artifact
+      - name: Uploading `macOSMonterey` UNIX Theme
+        uses: actions/upload-artifact@v2
+        with:
+          name: macOSMonterey
+          path: macOSMonterey.tar.gz
+
+      - name: Uploading `macOSBigSur-White` UNIX Theme
         uses: actions/upload-artifact@v2
         with:
           name: macOSBigSur-White
           path: macOSBigSur-White.tar.gz
 
-      - name: Uploading `macOSBigSur` Windows Theme artifact
+      - name: Uploading `macOSMonterey-White` UNIX Theme
+        uses: actions/upload-artifact@v2
+        with:
+          name: macOSMonterey-White
+          path: macOSMonterey-White.tar.gz
+
+      - name: Uploading `macOSBigSur` Windows Theme
         uses: actions/upload-artifact@v2
         with:
           name: macOSBigSur-Windows
           path: themes/macOSBigSur-Windows/*
 
-      - name: Uploading `macOSBigSur-White` Windows Theme artifact
+      - name: Uploading `macOSMonterey` Windows Theme
+        uses: actions/upload-artifact@v2
+        with:
+          name: macOSMonterey-Windows
+          path: themes/macOSMonterey-Windows/*
+
+      - name: Uploading `macOSBigSur-White` Windows Theme
         uses: actions/upload-artifact@v2
         with:
           name: macOSBigSur-White-Windows
           path: themes/macOSBigSur-White-Windows/*
+
+      - name: Uploading `macOSMonterey-White` Windows Theme
+        uses: actions/upload-artifact@v2
+        with:
+          name: macOSMonterey-White-Windows
+          path: themes/macOSMonterey-White-Windows/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,13 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [v1.2.3] - 23 Nov 2021
+
 ### Added
 
+- macOSMonterey cursors added 🎊 fixed #66
 - Generate master `bitmaps.zip` inside `bin` directory
 - `Makefile` binaries targets with variable
 - pling docs: size and support info updated
 - `bigsur` cursor bitmapper as node package
 - New commands added inside `Makefile` for `bitmapper`
+- symlink script for `macOSMonterey` svg files
 
 ### Changed
 

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ clean:
 	@rm -rf bitmaps themes
 
 render: bitmapper svg
-	@cd bitmapper && make install render_bigsur
+	@cd bitmapper && make install render_bigsur render_monterey
 
 build: bitmaps
 	@cd builder && make setup build
@@ -29,11 +29,19 @@ render_bigsur: bitmapper svg
 build_bigsur: bitmaps
 	@cd builder && make setup build_bigsur
 
+# macOS Monterey
+monterey: clean render_monterey build_monterey
+
+render_monterey: bitmapper svg
+	@cd bitmapper && make install render_monterey
+
+build_monterey: bitmaps
+	@cd builder && make setup build_monterey
 
 # Installation
 .ONESHELL:
 SHELL:=/bin/bash
-THEME_PREFIX = macOSBigSur
+THEME_PREFIX = macOS
 
 src := ./themes/
 
@@ -48,24 +56,32 @@ install: $(src)
 	@if [[ $EUID -ne 0 ]]; then
 		@echo "> Installing '$(THEME_PREFIX)' cursors inside $(local)/..."
 		@mkdir -p $(local)
-		@cp -r ./themes/$(THEME_PREFIX) $(local_dest)
-		@cp -r ./themes/$(THEME_PREFIX)-White $(local_dest) && echo "> Installed!"
+		@cp -r ./themes/$(THEME_PREFIX)BigSur $(local_dest)
+		@cp -r ./themes/$(THEME_PREFIX)BigSur -White $(local_dest) && echo "> Installed!"
+		@cp -r ./themes/$(THEME_PREFIX)Monterey $(local_dest)
+		@cp -r ./themes/$(THEME_PREFIX)Monterey -White $(local_dest) && echo "> Installed!"
 	@else
 		@echo "> Installing '$(THEME_PREFIX)' cursors inside $(root)/..."
 		@mkdir -p $(root)
-		@sudo cp -r ./themes/$(THEME_PREFIX) $(root_dest)
-		@sudo cp -r ./themes/$(THEME_PREFIX)-White $(root_dest) && echo "> Installed!"
+		@sudo cp -r ./themes/$(THEME_PREFIX)BigSur $(root_dest)
+		@sudo cp -r ./themes/$(THEME_PREFIX)BigSur-White $(root_dest) && echo "> Installed!"
+		@sudo cp -r ./themes/$(THEME_PREFIX)Monterey $(root_dest)
+		@sudo cp -r ./themes/$(THEME_PREFIX)Monterey-White $(root_dest) && echo "> Installed!"
 	@fi
 
 uninstall:
 	@if [[ $EUID -ne 0 ]]; then
 		@echo "> Removing '$(THEME_PREFIX)' from '$(local)'..."
-		@rm -rf $(local)/$(THEME_PREFIX)
-		@rm -rf $(local)/$(THEME_PREFIX)-White
+		@rm -rf $(local)/$(THEME_PREFIX)BigSur
+		@rm -rf $(local)/$(THEME_PREFIX)BigSur-White
+		@rm -rf $(local)/$(THEME_PREFIX)Monterey
+		@rm -rf $(local)/$(THEME_PREFIX)Monterey-White
 	@else
 		@echo "> Removing '$(THEME_PREFIX)' from '$(root)'..."
-		@rm -rf $(root)/$(THEME_PREFIX)
-		@rm -rf $(root)/$(THEME_PREFIX)-White
+		@rm -rf $(root)/$(THEME_PREFIX)BigSur
+		@rm -rf $(root)/$(THEME_PREFIX)BigSur-White
+		@rm -rf $(root)/$(THEME_PREFIX)Monterey
+		@rm -rf $(root)/$(THEME_PREFIX)Monterey-White
 	@fi
 
 reinstall: uninstall install
@@ -76,16 +92,24 @@ BIN_DIR = ../bin
 THEMES = White
 prepare: bitmaps themes
 	@rm -rf bin
-	@mkdir -p bin/$(THEME_PREFIX)
-	@$(foreach theme,$(THEMES), mkdir -p bin/$(THEME_PREFIX)-$(theme);)
+	@mkdir -p bin/$(THEME_PREFIX)BigSur
+	@$(foreach theme,$(THEMES), mkdir -p bin/$(THEME_PREFIX)BigSur-$(theme);)
+	@mkdir -p bin/$(THEME_PREFIX)Monterey
+	@$(foreach theme,$(THEMES), mkdir -p bin/$(THEME_PREFIX)Monterey-$(theme);)
 	@cd bitmaps
-	@zip -r $(BIN_DIR)/$(THEME_PREFIX)/bitmaps.zip $(THEME_PREFIX)
-	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/$(THEME_PREFIX)-$(theme)/bitmaps.zip $(THEME_PREFIX)-$(theme);)
+	@zip -r $(BIN_DIR)/$(THEME_PREFIX)BigSur/bitmaps.zip $(THEME_PREFIX)BigSur
+	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/$(THEME_PREFIX)BigSur-$(theme)/bitmaps.zip $(THEME_PREFIX)BigSur-$(theme);)
+	@zip -r $(BIN_DIR)/$(THEME_PREFIX)Monterey/bitmaps.zip $(THEME_PREFIX)Monterey
+	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/$(THEME_PREFIX)Monterey-$(theme)/bitmaps.zip $(THEME_PREFIX)Monterey-$(theme);)
 	@zip -r $(BIN_DIR)/bitmaps.zip *
 	@cd ..
 	@cd themes
-	@tar -czvf $(BIN_DIR)/$(THEME_PREFIX)/$(THEME_PREFIX).tar.gz $(THEME_PREFIX)
-	@zip -r $(BIN_DIR)/$(THEME_PREFIX)/$(THEME_PREFIX)-Windows.zip $(THEME_PREFIX)-Windows
-	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/$(THEME_PREFIX)-$(theme)/$(THEME_PREFIX)-$(theme).tar.gz $(THEME_PREFIX)-$(theme);)
-	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/$(THEME_PREFIX)-$(theme)/$(THEME_PREFIX)-$(theme)-Windows.zip $(THEME_PREFIX)-$(theme)-Windows;)
+	@tar -czvf $(BIN_DIR)/$(THEME_PREFIX)BigSur/$(THEME_PREFIX)BigSur.tar.gz $(THEME_PREFIX)BigSur
+	@zip -r $(BIN_DIR)/$(THEME_PREFIX)BigSur/$(THEME_PREFIX)BigSur-Windows.zip $(THEME_PREFIX)BigSur-Windows
+	@tar -czvf $(BIN_DIR)/$(THEME_PREFIX)Monterey/$(THEME_PREFIX)Monterey.tar.gz $(THEME_PREFIX)Monterey
+	@zip -r $(BIN_DIR)/$(THEME_PREFIX)Monterey/$(THEME_PREFIX)Monterey-Windows.zip $(THEME_PREFIX)Monterey-Windows
+	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/$(THEME_PREFIX)BigSur-$(theme)/$(THEME_PREFIX)BigSur-$(theme).tar.gz $(THEME_PREFIX)BigSur-$(theme);)
+	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/$(THEME_PREFIX)BigSur-$(theme)/$(THEME_PREFIX)BigSur-$(theme)-Windows.zip $(THEME_PREFIX)BigSur-$(theme)-Windows;)
+	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/$(THEME_PREFIX)Monterey-$(theme)/$(THEME_PREFIX)Monterey-$(theme).tar.gz $(THEME_PREFIX)Monterey-$(theme);)
+	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/$(THEME_PREFIX)Monterey-$(theme)/$(THEME_PREFIX)Monterey-$(theme)-Windows.zip $(THEME_PREFIX)Monterey-$(theme)-Windows;)
 	@cd ..
diff --git a/README.md b/README.md
@@ -36,11 +36,58 @@ Enjoy macOS cursors for `Windows` and `Linux` with _HiDPI Support_ .
 
 - macOSBigSur: [https://www.pling.com/p/1408466](https://www.pling.com/p/1408466)
 - macOSBigSur-White: [https://www.pling.com/p/1616779](https://www.pling.com/p/1616779)
+- macOSMonterey: [https://www.pling.com/p/1648124](https://www.pling.com/p/1648124)
+- macOSMonterey-White: [https://www.pling.com/p/1648129](https://www.pling.com/p/1648129)
+
+#### Preview:
+
+> Check Figma file [here](https://www.figma.com/file/OZw8Ylb9xPFw9h1uZYSMFa/Mac-Cursor?node-id=0%3A1)
+
+<p align="center">
+  <img title="macOSMonterey" src="https://imgur.com/bmS0fRT.png">
+  </br>
+  <sub>macOSMonterey Cursors</sub>
+</p>
+
+<p align="center">
+  <img title="macOSMonterey White" src="https://imgur.com/s0nqcje.png">
+  </br>
+  <sub>macOSMonterey White Cursors</sub>
+</p>
+
+<p align="center">
+  <img title="macOSBigSur" src="https://imgur.com/Q022eSp.png">
+  </br>
+  <sub>macOSBigSur Cursors</sub>
+</p>
+
+<p align="center">
+  <img title="macOSBigSur White" src="https://imgur.com/SFVR945.png">
+  </br>
+  <sub>macOSBigSur White Cursors</sub>
+</p>
 
 ### Manual Install
 
+> Note: replace name according package name.
+
 #### Linux/X11
 
+##### macOSMonterey
+
+```bash
+# extract `macOSMonterey.tar.gz`
+tar -xvf macOSMonterey.tar.gz
+
+# For local users
+mv macOSMonterey ~/.icons/
+
+# For all users
+sudo mv macOSMonterey /usr/share/icons/
+```
+
+##### macOSBigSur
+
 ```bash
 # extract `macOSBigSur.tar.gz`
 tar -xvf macOSBigSur.tar.gz
@@ -54,27 +101,21 @@ sudo mv macOSBigSur /usr/share/icons/
 
 #### Windows
 
-1. unzip `macOSBigSur_Windows.zip` file
-2. Open `macOSBigSur_Windows/` in Explorer, and **right click** on `install.inf`.
+##### macOSMonterey
+
+1. unzip `macOSMonterey-Windows.zip` file
+2. Open `macOSMonterey-Windows/` in Explorer, and **right click** on `install.inf`.
 3. Click 'Install' from the context menu, and authorize the modifications to your system.
-4. Open _Control Panel > Personalization and Appearance > Change mouse pointers_, and select **MacOSBigSur Cursors**.
+4. Open _Control Panel > Personalization and Appearance > Change mouse pointers_, and select **MacOSMonterey Cursors**.
 5. Click '**Apply**'.
 
-#### Preview:
+##### macOSBigSur
 
-> Check Figma file [here](https://www.figma.com/file/OZw8Ylb9xPFw9h1uZYSMFa/Mac-Cursor?node-id=0%3A1)
-
-<p align="center">
-  <img title="macOSBigSur" src="https://imgur.com/Q022eSp.png">
-  </br>
-  <sub>macOSBigSur Cursors</sub>
-</p>
-
-<p align="center">
-  <img title="macOSBigSur White" src="https://imgur.com/SFVR945.png">
-  </br>
-  <sub>macOSBigSur White Cursors</sub>
-</p>
+1. unzip `macOSBigSur-Windows.zip` file
+2. Open `macOSBigSur-Windows/` in Explorer, and **right click** on `install.inf`.
+3. Click 'Install' from the context menu, and authorize the modifications to your system.
+4. Open _Control Panel > Personalization and Appearance > Change mouse pointers_, and select **MacOSBigSur Cursors**.
+5. Click '**Apply**'.
 
 # Dependencies
 
@@ -132,12 +173,14 @@ sudo dnf install libX11-devel libXcursor-devel libpng-devel
 
 ## Build From Scratch
 
-### ⚡ Auto Build (using GitHub Actions)
+### Auto Build (using GitHub Actions)
 
 GitHub Actions is automatically runs on every `push`(on **main** and **dev** branches) and `pull request`(on **main** branch), You found theme resources in `artifact` section of **build**.GitHub **Actions** source is available inside [.github/workflows](https://github.com/ful1e5/apple_cursor/tree/main/.github/workflows) directory.
 
 ### Manual Build
 
+> Check **[Makefile](./Makefile)** for more targets.
+
 ```bash
 make
 ```

diff --git a/bitmapper/Makefile b/bitmapper/Makefile
@@ -15,4 +15,7 @@ install: node_modules package.json
 render_bigsur:
 	@yarn render:bigsur
 
-render: render_bigsur
+render_monterey:
+	@yarn render:monterey
+
+render: render_bigsur render_monterey
diff --git a/bitmapper/package.json b/bitmapper/package.json
@@ -1,13 +1,14 @@
 {
   "name": "apple-cursor",
-  "version": "1.1.2",
+  "version": "1.2.3",
   "description": "OpenSource macOS cursors.",
   "main": "index.js",
   "author": "Kaiz Khatri",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
-    "render:bigsur": "yarn workspace bigsur render"
+    "render:bigsur": "yarn workspace bigsur render",
+    "render:monterey": "yarn workspace monterey render"
   },
   "workspaces": [
     "packages/*"

diff --git a/bitmapper/packages/bigsur/package.json b/bitmapper/packages/bigsur/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bigsur",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "macOS Big Sur cursors",
   "main": "dist/index.js",
   "scripts": {

diff --git a/bitmapper/packages/core/package.json b/bitmapper/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Apple Cursor bitmapper's core modules",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/bitmapper/packages/monterey/package.json b/bitmapper/packages/monterey/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "monterey",
+  "version": "1.2.3",
+  "description": "macOS Monterey  cursors",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "npx tsc --build",
+    "render": "yarn build && node dist/index.js"
+  },
+  "author": "Kaiz Khatri",
+  "license": "GPL-3.0",
+  "private": true,
+  "devDependencies": {
+    "ts-node": "^9.1.1",
+    "typescript": "^4.1.5"
+  }
+}