[fix #5] Merge sshtoggled with main tweak (#6)

[fix #5] Merge sshtoggled with main tweak

README.md

@@ -12,26 +12,17 @@
 
 ### Install
 
-`sshtoggle` tweak also has `sshtoggled` daemon dependency.
+Get the latest version from [releases](https://github.com/Praseetha-KR/sshtoggle/releases) page
 
-Get the latest version for both tweak & daemon from the [releases](https://github.com/Praseetha-KR/sshtoggle/releases) page
-
-```bash
+```zsh
 $ ssh root@<device_ip>
 
-# daemon
-curl -sSL https://github.com/Praseetha-KR/sshtoggle/releases/download/0.0.2/in.imagineer.sshtoggled_0.0.2_iphoneos-arm.deb?raw=true -O
+curl -sSL https://github.com/Praseetha-KR/sshtoggle/releases/download/0.0.4/in.imagineer.sshtoggle_0.0.4_iphoneos-arm.deb?raw=true -O
 
-dpkg -i in.imagineer.sshtoggled_0.0.2_iphoneos-arm.deb\?raw\=true
+dpkg -i in.imagineer.sshtoggle_0.0.4_iphoneos-arm.deb\?raw\=true
 
 launchctl load -w /Library/LaunchDaemons/in.imagineer.sshtoggled.plist
 
-
-# tweak
-curl -sSL https://github.com/Praseetha-KR/sshtoggle/releases/download/0.0.2/in.imagineer.sshtoggle_0.0.2_iphoneos-arm.deb?raw=true -O
-
-dpkg -i in.imagineer.sshtoggle_0.0.2_iphoneos-arm.deb\?raw\=true
-
 killall -9 backboardd
 ```
 

scripts/compile.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 set -eux
 
-cd sshtoggled
-make package
-cd ..
-
 cd sshtoggle
 make package
 cd ..

scripts/install.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 set -eux
 
-cd sshtoggled
-make package install
-cd ..
-
 cd sshtoggle
 make package install
 cd ..

scripts/release.sh

@@ -1,12 +1,5 @@
 #!/bin/bash
 
-cd sshtoggled
-rm -rf .theos
-rm -rf packages
-make package FINALPACKAGE=1
-# make install
-cd ..
-
 cd sshtoggle
 rm -rf .theos
 rm -rf packages

sshtoggle/Makefile

@@ -9,5 +9,10 @@ sshtoggle_FILES = Tweak.xm
 sshtoggle_CFLAGS = -fobjc-arc
 
 include $(THEOS_MAKE_PATH)/tweak.mk
+SUBPROJECTS += sshtoggled
 SUBPROJECTS += sshtogglepreferences
 include $(THEOS_MAKE_PATH)/aggregate.mk
+
+after-install::
+	install.exec "launchctl unload /Library/LaunchDaemons/in.imagineer.sshtoggled.plist"
+	install.exec "launchctl load -w /Library/LaunchDaemons/in.imagineer.sshtoggled.plist"

sshtoggle/control

@@ -1,8 +1,8 @@
 Package: in.imagineer.sshtoggle
 Name: sshtoggle
 Pre-Depends:
-Depends: mobilesubstrate, in.imagineer.sshtoggled
-Version: 0.0.3
+Depends: mobilesubstrate
+Version: 0.0.4
 Architecture: iphoneos-arm
 Description: A tweak to start/stop SSH daemon
 Maintainer: Praseetha KR <[email protected]>

sshtoggled/Makefile → sshtoggle/sshtoggled/Makefile

@@ -8,11 +8,5 @@ sshtoggled_CFLAGS = -fobjc-arc
 include $(THEOS_MAKE_PATH)/tool.mk
 include $(THEOS_MAKE_PATH)/aggregate.mk
 
-before-install::
-	install.exec "launchctl unload /Library/LaunchDaemons/in.imagineer.sshtoggled.plist"
-
 internal-stage::
 	ldid -Sent.xml $(THEOS_STAGING_DIR)/usr/bin/sshtoggled
-
-after-install::
-	install.exec "launchctl load -w /Library/LaunchDaemons/in.imagineer.sshtoggled.plist"

sshtoggled/main.m → sshtoggle/sshtoggled/main.m

@@ -1,4 +1,4 @@
-#import "NSTask.h"
+#import "../NSTask.h"
 
 
 static void startSSH(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo)