undo rsync path change

Samgisaninja · Mar 4, 2020 · 853102e · 853102e
1 parent abc5931
commit 853102e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/SuccessionRestore.xcodeproj/project.pbxproj b/SuccessionRestore.xcodeproj/project.pbxproj
@@ -623,7 +623,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SuccessionRestore",
 				);
-				MARKETING_VERSION = "1.4.12~b3";
+				MARKETING_VERSION = "1.4.12~b5";
 				PRODUCT_BUNDLE_IDENTIFIER = com.samgisaninja.SuccessionRestore;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -649,7 +649,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SuccessionRestore",
 				);
-				MARKETING_VERSION = "1.4.12~b3";
+				MARKETING_VERSION = "1.4.12~b5";
 				PRODUCT_BUNDLE_IDENTIFIER = com.samgisaninja.SuccessionRestore;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/...proj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/SuccessionRestore/RestoreViewController.m b/SuccessionRestore/RestoreViewController.m
@@ -593,12 +593,15 @@ -(void)successionRestore{
             [self logToFile:@"using unsupported tethered downgrade as requested" atLineNumber:__LINE__];
             [rsyncMutableArgs addObject:@"--exclude=/usr/share/firmware/"];
         }
-        NSArray *rsyncArgs = [NSArray arrayWithArray:rsyncMutableArgs];
         NSTask *rsyncTask = [[NSTask alloc] init];
         [rsyncTask setLaunchPath:[[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"succdatroot"]];
         if ([[NSFileManager defaultManager] fileExistsAtPath:[_successionPrefs objectForKey:@"custom_rsync_path"]]) {
             [self logToFile:[NSString stringWithFormat:@"found rsync at path: %@", [_successionPrefs objectForKey:@"custom_rsync_path"]] atLineNumber:__LINE__];
-            [rsyncMutableArgs insertObject:[_successionPrefs objectForKey:@"custom_rsync_path"] atIndex:0];
+            if ([(NSString *)[_successionPrefs objectForKey:@"custom_rsync_path"] isEqualToString:@"/usr/bin/rsync"]) {
+                [rsyncMutableArgs insertObject:@"rsync" atIndex:0];
+            } else {
+                [rsyncMutableArgs insertObject:[_successionPrefs objectForKey:@"custom_rsync_path"] atIndex:0];
+            }
         } else {
             [self logToFile:[NSString stringWithFormat:@"couldnt find rsync at path %@, checking /usr/bin/rsync to see if user accidentally changed preferences", [_successionPrefs objectForKey:@"custom_rsync_path"]] atLineNumber:__LINE__];
             if ([[NSFileManager defaultManager] fileExistsAtPath:@"/usr/bin/rsync"]) {
@@ -614,6 +617,7 @@ -(void)successionRestore{
             }
         }
         [self logToFile:[NSString stringWithFormat:@"/Applications/SuccessionRestore.app/succdatroot %@", [rsyncMutableArgs componentsJoinedByString:@" "]] atLineNumber:__LINE__];
+        NSArray *rsyncArgs = [NSArray arrayWithArray:rsyncMutableArgs];
         [rsyncTask setArguments:rsyncArgs];
         NSPipe *outputPipe = [NSPipe pipe];
         [rsyncTask setStandardOutput:outputPipe];

diff --git a/Template/DEBIAN/control b/Template/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: com.samgisaninja.successionrestore
 Name: Succession
-Version: 1.4.12-b4
+Version: 1.4.12-b5
 Architecture: iphoneos-arm
 Description: Restore without updating via rootfilesystem DMG
 Maintainer: Samg_is_a_Ninja