Switch back to theos

5 files changed, 45 insertions, 34 deletions

diff --git a/QuickActions/DragonMake b/QuickActions/DragonMake
deleted file mode 100644
index ee1cb80..0000000
--- a/QuickActions/DragonMake
+++ /dev/null
@@ -1,33 +0,0 @@
-name: QuickActions
-id: com.cameronkatri.quickactions
-depends: mobilesubstrate
-architecture: iphoneos-arm
-version: 1.0.0
-description: Quickly launch apps from the lockscreen
-author: Cameron Katri <me+quickactions@cameronkatri.com>
-section: Tweaks
-depends: mobilesubstrate, preferenceloader
-icmd: sbreload
-
-QuickActions:
-  type: tweak
-  filter:
-    executables:
-    - SpringBoard
-  files:
-    - Tweak.x
-  frameworks:
-    - CoverSheet
-    - SpringBoardFoundation
-  targetvers: 13.0
-
-QuickActionsPrefs:
-  type: prefs
-  dir: QuickActionsPrefs
-  files:
-    - QASRootListController.m
-    - QASAppSelectorController.m
-    - LSApplicationProxy+AltList.m
-  frameworks:
-    - MobileCoreServices
-  targetvers: 13.0
diff --git a/QuickActions/Makefile b/QuickActions/Makefile
new file mode 100644
index 0000000..91a8548
--- /dev/null
+++ b/QuickActions/Makefile
@@ -0,0 +1,18 @@
+#THEOS_PACKAGE_SCHEME=rootless
+
+TARGET := iphone:14.5:15.0
+INSTALL_TARGET_PROCESSES = SpringBoard
+
+ARCHS := arm64 arm64e
+
+include $(THEOS)/makefiles/common.mk
+
+TWEAK_NAME = QuickActions
+
+QuickActions_FILES = Tweak.x
+QuickActions_CFLAGS = -fobjc-arc
+QuickActions_PRIVATE_FRAMEWORKS = CoverSheet SpringBoardFoundation
+
+include $(THEOS_MAKE_PATH)/tweak.mk
+SUBPROJECTS += QuickActionsPrefs
+include $(THEOS_MAKE_PATH)/aggregate.mk
diff --git a/QuickActions/QuickActionsPrefs/Makefile b/QuickActions/QuickActionsPrefs/Makefile
new file mode 100644
index 0000000..a00d795
--- /dev/null
+++ b/QuickActions/QuickActionsPrefs/Makefile
@@ -0,0 +1,16 @@
+TARGET := iphone:14.5:15.0
+
+include $(THEOS)/makefiles/common.mk
+
+ARCHS := arm64 arm64e
+
+BUNDLE_NAME = QuickActionsPrefs
+
+QuickActionsPrefs_FILES = QASRootListController.m QASAppSelectorController.m LSApplicationProxy+AltList.m
+QuickActionsPrefs_FRAMEWORKS = UIKit
+QuickActionsPrefs_PRIVATE_FRAMEWORKS = Preferences
+QuickActionsPrefs_EXTRA_FRAMEWORKS = MobileCoreServices
+QuickActionsPrefs_INSTALL_PATH = /Library/PreferenceBundles
+QuickActionsPrefs_CFLAGS = -fobjc-arc
+
+include $(THEOS_MAKE_PATH)/bundle.mk
diff --git a/QuickActions/QuickActionsPrefs/QASRootListController.m b/QuickActions/QuickActionsPrefs/QASRootListController.m
index 31a4eb7..c3701eb 100644
--- a/QuickActions/QuickActionsPrefs/QASRootListController.m
+++ b/QuickActions/QuickActionsPrefs/QASRootListController.m
@@ -18,6 +18,7 @@
 #import <Preferences/PSSpecifier.h>
 #import "QASRootListController.h"
 #include <spawn.h>
+#include <rootless.h>
 
 @implementation QASRootListController
 
@@ -39,7 +40,7 @@
 {
 	pid_t pid;
 	const char *args[] = {"sbreload", NULL, NULL, NULL};
-	posix_spawn(&pid, "usr/bin/sbreload", NULL, NULL, (char *const *)args, NULL);
+	posix_spawn(&pid, ROOT_PATH("/usr/bin/sbreload"), NULL, NULL, (char *const *)args, NULL);
 }
 
 @end
diff --git a/QuickActions/control b/QuickActions/control
new file mode 100644
index 0000000..89ec283
--- /dev/null
+++ b/QuickActions/control
@@ -0,0 +1,9 @@
+Package: com.cameronkatri.quickactions
+Name: QuickActions
+Version: 1.0.0
+Architecture: iphoneos-arm
+Description: Quickly launch apps from the lockscreen
+Maintainer: Cameron Katri <me+quickactions@cameronkatri.com>
+Author: Cameron Katri <me+quickactions@cameronkatri.com>
+Section: Tweaks
+Depends: mobilesubstrate (>= 0.9.5000), preferenceloader