From b6eaa8d3c455d3a1b7f52fa4eea57c4939dad9ba Mon Sep 17 00:00:00 2001 From: relikd Date: Wed, 28 Jan 2026 12:44:43 +0100 Subject: [PATCH] ref: move files to dedicated res folder --- Makefile | 9 ++++----- README.md | 2 +- {src => res}/AppIcon.icns | Bin {examples => res/examples}/Custom Sort Order/1. One | 0 {examples => res/examples}/Custom Sort Order/2. Two | 0 .../examples}/Custom Sort Order/3. Three | 0 .../examples}/Custom Sort Order/4. Four | 0 {examples => res/examples}/Custom Sort Order/9 Nine | 0 .../examples}/Custom Sort Order/999 Zero | 0 {examples => res/examples}/Custom Sort Order/Five | 0 .../examples}/Flags/999 Python example [verbose] | 0 {examples => res/examples}/Flags/icon.svg | 0 .../examples}/Flags/ifconfig (text editor) [txt] | 0 .../examples}/Flags/top (updated) [verbose] | 0 {examples => res/examples}/Open Desktop Folder | 0 {examples => res/examples}/Toggle Desktop Icons | 0 src/main.swift | 4 ++-- 17 files changed, 7 insertions(+), 8 deletions(-) rename {src => res}/AppIcon.icns (100%) rename {examples => res/examples}/Custom Sort Order/1. One (100%) rename {examples => res/examples}/Custom Sort Order/2. Two (100%) rename {examples => res/examples}/Custom Sort Order/3. Three (100%) rename {examples => res/examples}/Custom Sort Order/4. Four (100%) rename {examples => res/examples}/Custom Sort Order/9 Nine (100%) rename {examples => res/examples}/Custom Sort Order/999 Zero (100%) rename {examples => res/examples}/Custom Sort Order/Five (100%) rename {examples => res/examples}/Flags/999 Python example [verbose] (100%) rename {examples => res/examples}/Flags/icon.svg (100%) rename {examples => res/examples}/Flags/ifconfig (text editor) [txt] (100%) rename {examples => res/examples}/Flags/top (updated) [verbose] (100%) rename {examples => res/examples}/Open Desktop Folder (100%) rename {examples => res/examples}/Toggle Desktop Icons (100%) diff --git a/Makefile b/Makefile index 70199ba..a19e229 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ HAS_SIGN_IDENTITY=$(shell security find-identity -v -p codesigning | grep -q "Ap Menuscript.app: SDK_PATH=$(shell xcrun --show-sdk-path --sdk macosx) -Menuscript.app: src/* examples/* +Menuscript.app: src/* res/** @mkdir -p Menuscript.app/Contents/MacOS/ swiftc ${CFLAGS} src/main.swift -target x86_64-apple-macos10.13 \ -emit-executable -sdk ${SDK_PATH} -o bin_x64 @@ -20,11 +20,10 @@ Menuscript.app: src/* examples/* lipo -create bin_x64 bin_arm64 -o Menuscript.app/Contents/MacOS/Menuscript @rm bin_x64 bin_arm64 @echo 'APPL????' > Menuscript.app/Contents/PkgInfo - @mkdir -p Menuscript.app/Contents/Resources/ - @cp src/AppIcon.icns Menuscript.app/Contents/Resources/AppIcon.icns - @rm -rf Menuscript.app/Contents/Resources/examples/ - @cp -R examples/ Menuscript.app/Contents/Resources/examples/ @cp src/Info.plist Menuscript.app/Contents/Info.plist + @find res -name .DS_Store -delete + @rm -rf Menuscript.app/Contents/Resources/ + @cp -R res/ Menuscript.app/Contents/Resources/ @touch Menuscript.app @echo ifeq ($(HAS_SIGN_IDENTITY),1) diff --git a/README.md b/README.md index 5caf756..a018f4a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ A menu bar script executor. Menuscript adds a status bar menu to call custom (user defined) scripts. The app reads the content of a directory and adds all executable files to the status menu. -The screenshot above represents the content of the [examples](examples/) directory. +The screenshot above represents the content of the [res/examples](res/examples/) directory. ## Usage diff --git a/src/AppIcon.icns b/res/AppIcon.icns similarity index 100% rename from src/AppIcon.icns rename to res/AppIcon.icns diff --git a/examples/Custom Sort Order/1. One b/res/examples/Custom Sort Order/1. One similarity index 100% rename from examples/Custom Sort Order/1. One rename to res/examples/Custom Sort Order/1. One diff --git a/examples/Custom Sort Order/2. Two b/res/examples/Custom Sort Order/2. Two similarity index 100% rename from examples/Custom Sort Order/2. Two rename to res/examples/Custom Sort Order/2. Two diff --git a/examples/Custom Sort Order/3. Three b/res/examples/Custom Sort Order/3. Three similarity index 100% rename from examples/Custom Sort Order/3. Three rename to res/examples/Custom Sort Order/3. Three diff --git a/examples/Custom Sort Order/4. Four b/res/examples/Custom Sort Order/4. Four similarity index 100% rename from examples/Custom Sort Order/4. Four rename to res/examples/Custom Sort Order/4. Four diff --git a/examples/Custom Sort Order/9 Nine b/res/examples/Custom Sort Order/9 Nine similarity index 100% rename from examples/Custom Sort Order/9 Nine rename to res/examples/Custom Sort Order/9 Nine diff --git a/examples/Custom Sort Order/999 Zero b/res/examples/Custom Sort Order/999 Zero similarity index 100% rename from examples/Custom Sort Order/999 Zero rename to res/examples/Custom Sort Order/999 Zero diff --git a/examples/Custom Sort Order/Five b/res/examples/Custom Sort Order/Five similarity index 100% rename from examples/Custom Sort Order/Five rename to res/examples/Custom Sort Order/Five diff --git a/examples/Flags/999 Python example [verbose] b/res/examples/Flags/999 Python example [verbose] similarity index 100% rename from examples/Flags/999 Python example [verbose] rename to res/examples/Flags/999 Python example [verbose] diff --git a/examples/Flags/icon.svg b/res/examples/Flags/icon.svg similarity index 100% rename from examples/Flags/icon.svg rename to res/examples/Flags/icon.svg diff --git a/examples/Flags/ifconfig (text editor) [txt] b/res/examples/Flags/ifconfig (text editor) [txt] similarity index 100% rename from examples/Flags/ifconfig (text editor) [txt] rename to res/examples/Flags/ifconfig (text editor) [txt] diff --git a/examples/Flags/top (updated) [verbose] b/res/examples/Flags/top (updated) [verbose] similarity index 100% rename from examples/Flags/top (updated) [verbose] rename to res/examples/Flags/top (updated) [verbose] diff --git a/examples/Open Desktop Folder b/res/examples/Open Desktop Folder similarity index 100% rename from examples/Open Desktop Folder rename to res/examples/Open Desktop Folder diff --git a/examples/Toggle Desktop Icons b/res/examples/Toggle Desktop Icons similarity index 100% rename from examples/Toggle Desktop Icons rename to res/examples/Toggle Desktop Icons diff --git a/src/main.swift b/src/main.swift index c289bf6..da67b7f 100755 --- a/src/main.swift +++ b/src/main.swift @@ -72,7 +72,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate { // if run via .app bundle return Bundle.main.url(forResource: name, withExtension: ext) // if calling swift directly - ?? URL(fileURLWithPath: #file + "/../../" + name + (ext == nil ? "" : ("." + ext!))) + ?? URL(fileURLWithPath: #file + "/../../res/" + name + (ext == nil ? "" : ("." + ext!))) } // MARK: - Manage storage path @@ -268,7 +268,7 @@ struct Entry { } } -extension Entry : Comparable { +extension Entry: Comparable { static func < (lhs: Entry, rhs: Entry) -> Bool { return (lhs.order, lhs.title) < (rhs.order, rhs.title) }