Browse Source

4.3.0 release commit

Kevin Bradley 3 years ago
parent
commit
2afb5e4caa
5 changed files with 16 additions and 9 deletions
  1. 1 1
      FLEX-tvOS-Info.plist
  2. 2 0
      FLEX.xcodeproj/project.pbxproj
  3. 3 2
      flexinjected/layout/DEBIAN/control
  4. 6 4
      postScript.sh
  5. 4 2
      tvOSBuild.sh

+ 1 - 1
FLEX-tvOS-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

+ 2 - 0
FLEX.xcodeproj/project.pbxproj

@@ -2777,6 +2777,7 @@
 				INSTALL_PATH = "@rpath";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 4.3.0;
 				OTHER_LDFLAGS = (
 					"-undefined",
 					dynamic_lookup,
@@ -2816,6 +2817,7 @@
 				INSTALL_PATH = "@rpath";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 4.3.0;
 				OTHER_LDFLAGS = (
 					"-undefined",
 					dynamic_lookup,

+ 3 - 2
flexinjected/layout/DEBIAN/control

@@ -1,9 +1,10 @@
 Package: com.nito.flexinjected
 Name: FLEXInjected
-Depends: mobilesubstrate, preferenceloader (>=1.5-15), applist (>=1.3-11), libflex (>=4.1.1b-6)
-Version: 1.3
+Depends: mobilesubstrate, preferenceloader (>=1.5-15), applist (>=1.3-11), libflex (>=4.3.0-1)
+Version: 1.4
 Architecture: appletvos-arm64
 Description: Inject FLEX into your favorite Applications utilizing applist
 Maintainer: Kevin Bradley
 Author: Kevin Bradley
 Section: Tweaks
+Depiction: https://nitosoft.com/ATV4/flex/flex.json

+ 6 - 4
postScript.sh

@@ -3,6 +3,7 @@
 export PATH=/usr/bin/opt/local/bin:/opt/local/sbin:/usr/local/git:$PATH
 export SRCROOT="$SRCROOT"
 
+echo "should SCP: -$SHOULD_SCP-"
 echo "## check $SRCROOT/postScript.sh for a helpful post script"
 
 # only used if we SCP the deb over, and this only happens if dpkg-deb and fauxsu are installed
@@ -40,12 +41,13 @@ find . -name ".DS_Store" | xargs rm -f
 
 EXE_PATH=$FINAL_FW_PATH/$EXECUTABLE_NAME
 #exit 0
+if [ "$SHOULD_SCP" == "1"  ]; then 
 ldid -S $EXE_PATH
 rm -rf $FINAL_FW_PATH/_CodeSignature
-/usr/local/bin/fakeroot dpkg-deb -b layout
-scp layout.deb root@$ATV_DEVICE_IP:~
-ssh root@$ATV_DEVICE_IP "dpkg -i layout.deb ; killall -9 nitoTV ; lsdtrip launch com.nito.nitoTV4"
-
+    /usr/local/bin/fakeroot dpkg-deb -b layout
+    scp layout.deb root@$ATV_DEVICE_IP:~
+    ssh root@$ATV_DEVICE_IP "dpkg -i layout.deb ; killall -9 nitoTV ; lsdtrip launch com.nito.nitoTV4"
+fi
 exit 0
 
 

+ 4 - 2
tvOSBuild.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 
-XCP=$(which xcpretty)
+XCP=$(which xcspretty)
 
 echo $XCP
-
+if [ "$1" == "scp" ]; then
+export SHOULD_SCP=1
+fi
 if [ -z $XCP ]; then
     xcodebuild BUILD_ROOT=build -target FLEX-tvOS
 else