Merge pull request #2 from 23Aaron/master

4.0.0

FlashBack/Applications/FlashBack.app/_CodeSignature/CodeResources

@@ -102,15 +102,15 @@
 		</data>
 		<key>Assets.car</key>
 		<data>
-		L8+7VONZhgMDQTQm1vXWd5ENDSQ=
+		eQ43kSDg9dgwwr4ZRL8uQl+At3E=
 		</data>
 		<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/objects-13.0+.nib</key>
 		<data>
-		43XZ7oX5Rju5w4ZAc1F/gPvDGX8=
+		4kAusL3lRc2Pe1DYQCQCdmwXQSM=
 		</data>
 		<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/runtime.nib</key>
 		<data>
-		ID3T/9elNNx1MzQ/x02MvQmp8YY=
+		V6V78R19TKspsUDEhDYQduqkrKg=
 		</data>
 		<key>Base.lproj/LaunchScreen.storyboardc/Info.plist</key>
 		<data>
@@ -118,23 +118,23 @@
 		</data>
 		<key>Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/objects-13.0+.nib</key>
 		<data>
-		Gr/BrTYPHstg1qywlC2Lo1Eax6Q=
+		Z+uis349COA4CDJvMdeXgfL29b8=
 		</data>
 		<key>Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/runtime.nib</key>
 		<data>
-		GV/ILQt/rh1+pgp+x8+kZ+f0htA=
+		4Pqr3jUVQxTF0iUruQsltDqw0t4=
 		</data>
 		<key>Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-11.0+.nib</key>
 		<data>
-		THoy2E8Yk71AxhzUezT4DpofFP0=
+		jxYEMCkMWat70XHYGyXrUzViJys=
 		</data>
 		<key>Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-13.0+.nib</key>
 		<data>
-		HQFoOwI5Jpgixn0GxDkB74yTnRw=
+		U3rtvbRaAKoDCsK9TUhiOVhyEQE=
 		</data>
 		<key>Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/runtime.nib</key>
 		<data>
-		ZWYdgigZT5U9il5vquNvQ0CrLrY=
+		ZmzJLs2Dhvk89EPpVHeriHxHmds=
 		</data>
 		<key>Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
@@ -142,31 +142,31 @@
 		</data>
 		<key>Base.lproj/Main.storyboardc/UITabBarController-GLq-WK-cLg.nib/objects-11.0+.nib</key>
 		<data>
-		njN5ObGpY2txF/4WhZTzgRTYWDY=
+		8nxmJG0jyNrhUS0TQv+1wR/T+t0=
 		</data>
 		<key>Base.lproj/Main.storyboardc/UITabBarController-GLq-WK-cLg.nib/objects-13.0+.nib</key>
 		<data>
-		LhTg2bcS6hT/F34SHxgCFeJQ9aM=
+		VZuOIIsYzSQuIM+ZdCFgiqCZ66M=
 		</data>
 		<key>Base.lproj/Main.storyboardc/UITabBarController-GLq-WK-cLg.nib/runtime.nib</key>
 		<data>
-		lESFbTNfKG5jB2j5mfLCJ6BQlZY=
+		wFhwH4kHJw9q4jRNBQVQN9Qo1Ys=
 		</data>
 		<key>Base.lproj/Main.storyboardc/gKu-Qu-mpe-view-NZZ-06-dEb.nib/objects-11.0+.nib</key>
 		<data>
-		KwWHmay2Js6k4URH+475yxzFtBs=
+		q60w4GufHOOjJvSPidNggW8C1rs=
 		</data>
 		<key>Base.lproj/Main.storyboardc/gKu-Qu-mpe-view-NZZ-06-dEb.nib/objects-13.0+.nib</key>
 		<data>
-		XrfOSu3qSzGzJY/5bmOT6jWCA7I=
+		A+zJ0veay8SeRaxXjZQQHCEIhVA=
 		</data>
 		<key>Base.lproj/Main.storyboardc/gKu-Qu-mpe-view-NZZ-06-dEb.nib/runtime.nib</key>
 		<data>
-		gsC8xfjY5TdjDo0NxZl1GszG3U8=
+		GmiZTpOfKRLcU0YzQV3EpAMIRT4=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		4T4SsOoO70cj0IPq4LqpAy2dk3Q=
+		b2PpzsAJqD/m5uK4Zjx+5XSJXRk=
 		</data>
 		<key>PkgInfo</key>
 		<data>
@@ -174,7 +174,7 @@
 		</data>
 		<key>embedded.mobileprovision</key>
 		<data>
-		u59kA4RBW3vYwal/3OBjkGx0YFk=
+		vcbpKeNM3rvJabf/TIfiNf5iblw=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -447,33 +447,33 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			L8+7VONZhgMDQTQm1vXWd5ENDSQ=
+			eQ43kSDg9dgwwr4ZRL8uQl+At3E=
 			</data>
 			<key>hash2</key>
 			<data>
-			MfbVWt5wUuBCo8BX2sqjxRoIGTEXiNqYfGmGa41Mvzk=
+			EWto84dyK/iFBVmmYBUTVZ3MoCu25V0qiqDmkIylMM4=
 			</data>
 		</dict>
 		<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/objects-13.0+.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			43XZ7oX5Rju5w4ZAc1F/gPvDGX8=
+			4kAusL3lRc2Pe1DYQCQCdmwXQSM=
 			</data>
 			<key>hash2</key>
 			<data>
-			QrjjXvRjOh30qulw3bUg7BwbxYlz2oUxdTJHy/zawGE=
+			3SN0uRhA9g/bBxO3pRqhvGckH5bD1bjg8rXCP2H/roQ=
 			</data>
 		</dict>
 		<key>Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib/runtime.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			ID3T/9elNNx1MzQ/x02MvQmp8YY=
+			V6V78R19TKspsUDEhDYQduqkrKg=
 			</data>
 			<key>hash2</key>
 			<data>
-			a/9ibnFKB8bFReCSeBkvHuChhCC1OPNwyyXPOn6r16U=
+			nt6SmQ67PPKDIG1gaxLu12p0PVjHHTdreB0VJ1W0Bys=
 			</data>
 		</dict>
 		<key>Base.lproj/LaunchScreen.storyboardc/Info.plist</key>
@@ -491,55 +491,55 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			Gr/BrTYPHstg1qywlC2Lo1Eax6Q=
+			Z+uis349COA4CDJvMdeXgfL29b8=
 			</data>
 			<key>hash2</key>
 			<data>
-			QKE6GTifhGQliB6/q3/apUS7NIY5Bo3UmHtQ3SJaGuo=
+			D8g+kx+YiXSohFwVA2Lp8xiY+9GQvouMKa7Y3/anJJo=
 			</data>
 		</dict>
 		<key>Base.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib/runtime.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			GV/ILQt/rh1+pgp+x8+kZ+f0htA=
+			4Pqr3jUVQxTF0iUruQsltDqw0t4=
 			</data>
 			<key>hash2</key>
 			<data>
-			XcGWaPrMNVqH75fQ/qWgHJ08jr1Aw/SD13G35dR+NZs=
+			+1i17h0TwlTLO8uQ4QwvweNKtJ1FJqOd9W62RihWIMQ=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-11.0+.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			THoy2E8Yk71AxhzUezT4DpofFP0=
+			jxYEMCkMWat70XHYGyXrUzViJys=
 			</data>
 			<key>hash2</key>
 			<data>
-			mUILkiQoSl0bGmtEeOM09fxudRIbvQ0FpaTr6nbHtl4=
+			3PyDnrYv3Ymm6AgxIyqEfusrGbcvZvkvDoaObPh3yb0=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/objects-13.0+.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			HQFoOwI5Jpgixn0GxDkB74yTnRw=
+			U3rtvbRaAKoDCsK9TUhiOVhyEQE=
 			</data>
 			<key>hash2</key>
 			<data>
-			InFmojbfppcO9TKaWD8pGUSbr8iJ+uz1Y7wO8/sJHKE=
+			xDj9jK94fJSNSJLxqmYlPn83uxk90qc4aruxASdLbEk=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib/runtime.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			ZWYdgigZT5U9il5vquNvQ0CrLrY=
+			ZmzJLs2Dhvk89EPpVHeriHxHmds=
 			</data>
 			<key>hash2</key>
 			<data>
-			5H4d3beICcbl5eTd/QyVf95BlxS9i1fcIhq3ZkTAm9E=
+			k8br9SRQmprVXd/mgJlYWhejIeEDi1yscH6R6BpH4nQ=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/Info.plist</key>
@@ -557,77 +557,77 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			njN5ObGpY2txF/4WhZTzgRTYWDY=
+			8nxmJG0jyNrhUS0TQv+1wR/T+t0=
 			</data>
 			<key>hash2</key>
 			<data>
-			xHqL+n3/rVZhiLomwYXstRyZyATlHyT7VV7y0VixZOk=
+			EdXW+QGWnI4Rs3eh6rcuNP/dsk3Qx8UUFmI8z7racXs=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/UITabBarController-GLq-WK-cLg.nib/objects-13.0+.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			LhTg2bcS6hT/F34SHxgCFeJQ9aM=
+			VZuOIIsYzSQuIM+ZdCFgiqCZ66M=
 			</data>
 			<key>hash2</key>
 			<data>
-			L+JSy/NyOGux0xel/B5jGt9nEUg3EEbKhe/Z4yJ4InM=
+			lRuuNsTVjLjOc9B01LFBz3CYG34fT/MlcFBOG1FiS20=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/UITabBarController-GLq-WK-cLg.nib/runtime.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			lESFbTNfKG5jB2j5mfLCJ6BQlZY=
+			wFhwH4kHJw9q4jRNBQVQN9Qo1Ys=
 			</data>
 			<key>hash2</key>
 			<data>
-			b2yX71s2WvZqozbfPYV2DayWcRD2zZ1lMJJUeJLqEOA=
+			yvGGs34GaCiYy1liszMq3l3m8KmhdoyETPrsCbP7OoQ=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/gKu-Qu-mpe-view-NZZ-06-dEb.nib/objects-11.0+.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			KwWHmay2Js6k4URH+475yxzFtBs=
+			q60w4GufHOOjJvSPidNggW8C1rs=
 			</data>
 			<key>hash2</key>
 			<data>
-			4B9wtSRDMRqWhY8nnPcO6A/krKPTPbBIXPUDLweGHZk=
+			FiNpSTj/PSiH8Is8cWUi+8fSn/6437WLqmzLIClBkyU=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/gKu-Qu-mpe-view-NZZ-06-dEb.nib/objects-13.0+.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			XrfOSu3qSzGzJY/5bmOT6jWCA7I=
+			A+zJ0veay8SeRaxXjZQQHCEIhVA=
 			</data>
 			<key>hash2</key>
 			<data>
-			quMYNwx6w+fqYyFz7AW9pAGPId+V2cC/mqciDoAXHk4=
+			s2b7w5KQrWTCc1qhnOrmRoOYeBskCF/2zmTyiwio1Lg=
 			</data>
 		</dict>
 		<key>Base.lproj/Main.storyboardc/gKu-Qu-mpe-view-NZZ-06-dEb.nib/runtime.nib</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			gsC8xfjY5TdjDo0NxZl1GszG3U8=
+			GmiZTpOfKRLcU0YzQV3EpAMIRT4=
 			</data>
 			<key>hash2</key>
 			<data>
-			gz/vJfO5MEwbFnMlyLSwkNM4YhHz7NswDlwSK6nEESM=
+			92mqlAt7+osvd1tIIR+b08hUoUkb+2vRhSoBN4wqH0E=
 			</data>
 		</dict>
 		<key>embedded.mobileprovision</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			u59kA4RBW3vYwal/3OBjkGx0YFk=
+			vcbpKeNM3rvJabf/TIfiNf5iblw=
 			</data>
 			<key>hash2</key>
 			<data>
-			CW7FUx6SkBv+ERzJHRCm70H1d/EZaY9MfKbfvOnEpxs=
+			JQ35Gy0hUBUa4oRqt9Dn+8pRcTA6pUIDqrmpztvHVY4=
 			</data>
 		</dict>
 	</dict>

FlashBack/DEBIAN/control

@@ -1,8 +1,8 @@
 Package: com.mpg13.FlashBack
 Name: FlashBack
 Depends: mobilesubstrate,com.chpwn.iconsupport,com.creaturecoding.crux,ldid
-Conflicts: com.mpg13.FlashBack
+Conflicts: com.mpg13.FlashBackfree
-Version: 4.0
+Version: 4.0.0
 Architecture: iphoneos-arm
 Description: Changing the way we do setups.
 Maintainer: MPG13 <mpg13@micahpgomez.dev>

FlashBack/usr/bin/FBCreate

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-crux _FlashBackCreate $1 $2 $3 $4
+crux _FlashBackCreate $1
 
 exit 0

FlashBack/usr/bin/FBRestore

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-crux _FlashBackRestore $1 $2 $3 $4
+crux _FlashBackRestore $1
 
 exit 0

FlashBack/usr/bin/_FlashBackCreate

@@ -6,9 +6,6 @@ shopt -s extglob # "Shell option set extglob" https://www.linuxjournal.com/conte
 set -f # "Disable file name generation (globbing)."
 
 BACKUPNAME=$1
-TWEAKSBACKUP=$2
-ICONSBACKUP=$3
-WALLPAPERBACKUP=$4
 
 set +f
 FLASHBACKDIR="/Library/FlashBack"
@@ -18,26 +15,13 @@ mkdir -p $BACKUPLOCATION
 mkdir -p $BACKUPLOCATION/{Preferences,SBFolder,AutoWall} || STATUS="mkdir failed"
 echo -e "\n\e[0;100m[!]\e[0m \e[104mCopying to $BACKUPLOCATION\e[0m"
 
-if [[ "$TWEAKSBACKUP" == "YES" ]]
-then
 cp -rf "/var/mobile/Library/Preferences/"!(com.apple*|com.saurik*|ckkeyrolld|nfcd|UITextInputContextIdentifiers|.GlobalPreferences).plist $BACKUPLOCATION/Preferences/ || STATUS="cp failed" #copy all non-apple Plists to Preference folder within backup haha
 cp -rf "/var/mobile/Library/Preferences/"*(*.jpg|*.png|*.gif) $BACKUPLOCATION/Preferences/ &>/dev/null    #copy all images to Preference folder within backup
-fi
+cp -rf /var/mobile/Library/SpringBoard/@(*Icon*|*Background*|SB*) $BACKUPLOCATION/SBFolder/ || STATUS="cp failed"        #copy IconState Plist to SBFolder folder within backup
-
-if [[ "$WALLPAPERBACKUP" == "YES" ]]
-then
-cp -rf /var/mobile/Library/SpringBoard/@(*Background*|SB*) $BACKUPLOCATION/SBFolder/ || STATUS="cp wallpaper failed"    #copy wallpaper files to SBFolder folder within backup
 if [[ -d /var/mobile/Media/AutoWall/ ]]
 then
 cp -rf "/var/mobile/Media/AutoWall/"* "$BACKUPLOCATION/AutoWall/"
 fi
-fi
-
-if [[ "$ICONSBACKUP" == "YES" ]]
-then
-cp -rf /var/mobile/Library/SpringBoard/@(*Icon*) $BACKUPLOCATION/SBFolder/ || STATUS="cp icons failed"    #copy IconState Plist to SBFolder folder within backup
-fi
-
 touch $BACKUPLOCATION/$BKPVERSION
 
 echo -e "\n\e[104m Success! \e[0m \n"

FlashBack/usr/bin/_FlashBackRestore

@@ -6,9 +6,6 @@ shopt -s extglob # "Shell option set extglob" https://www.linuxjournal.com/conte
 set -f # "Disable file name generation (globbing)."
 
 SELECTBACKUP=$1
-TWEAKSBACKUP=$2
-ICONSBACKUP=$3
-WALLPAPERBACKUP=$4
 
 set +f
 FLASHBACKDIR="/Library/FlashBack"
@@ -16,27 +13,16 @@ SELECTLOCATION=$FLASHBACKDIR/Backups/$SELECTBACKUP
 
 # COPY BACKUP TO SYSTEM
 
-if [[ "$TWEAKSBACKUP" == "YES" ]]
+cp -r $SELECTLOCATION/Preferences/* /var/mobile/Library/Preferences/ || STATUS="cp failed"
+cp -r $SELECTLOCATION/SBFolder/* /var/mobile/Library/SpringBoard/ || STATUS="cp failed"
+if [[ -d $SELECTLOCATION/AutoWall/ ]]
 then
-  cp -r $SELECTLOCATION/Preferences/ /var/mobile/Library/Preferences/ || STATUS="cp failed"
+rm -rf "/var/mobile/Media/AutoWall/"*
-fi
+cp -rf "$SELECTLOCATION/AutoWall/"* "/var/mobile/Media/AutoWall/" &>/dev/null
-
-if [[ "$WALLPAPERBACKUP" == "YES" ]]
-then
-  cp -rf $SELECTLOCATION/SBFolder/@(*Background*|SB*) /var/mobile/Library/SpringBoard/  || STATUS="cp wallpaper failed"    #copy wallpaper files to SBFolder folder within backup
-if [[ -d /var/mobile/Media/AutoWall/ ]]
-then
-cp -rf "$SELECTLOCATION/AutoWall/"* "/var/mobile/Media/AutoWall/"
-fi
-fi
-
-if [[ "$ICONSBACKUP" == "YES" ]]
-then
-  cp -rf $SELECTLOCATION/SBFolder/@(*Icon*) /var/mobile/Library/SpringBoard/ || STATUS="cp icons failed"    #copy IconState Plist to SBFolder folder within backup
 fi
 
 # clear caches and respring
-uicache --all || uicache
+uicache
 recache --no respring &>/dev/null
 killall cfprefsd #Clear settings caches - thanks to Grant/NewD
 sbreload && exit 0 || killall -9 SpringBoard && exit 0 # Kill the script.