From 6621d6f8cfdc6339b39f452cc15e0ca93389f412 Mon Sep 17 00:00:00 2001 From: syui Date: Tue, 9 Dec 2025 13:35:44 +0900 Subject: [PATCH] fix install.zsh pull --- install.zsh | 4 ++++ .../011-social-app-ios-splash-license-footer.patch | 10 +++------- .../019-social-app-ios-entitlements-plugin.patch | 13 ------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/install.zsh b/install.zsh index 5e9c7d2..1845aac 100755 --- a/install.zsh +++ b/install.zsh @@ -100,6 +100,10 @@ function at-repos-pull() { echo $repo if [ -d $d/repos/${repo##*/} ];then cd $d/repos/${repo##*/} + # Clean up before pull: reset changes, remove .orig files and untracked patch-created files + git checkout -- . + find . -name "*.orig" -type f -delete 2>/dev/null + git clean -fd 2>/dev/null git stash -u if ! git pull;then rm -rf $d/repos/${repo##*/} diff --git a/ios/patching/011-social-app-ios-splash-license-footer.patch b/ios/patching/011-social-app-ios-splash-license-footer.patch index ade2b21..d9c4005 100644 --- a/ios/patching/011-social-app-ios-splash-license-footer.patch +++ b/ios/patching/011-social-app-ios-splash-license-footer.patch @@ -1,5 +1,4 @@ diff --git a/src/view/com/auth/SplashScreen.tsx b/src/view/com/auth/SplashScreen.tsx -index 3442d1bdf..dd2d1fdfb 100644 --- a/src/view/com/auth/SplashScreen.tsx +++ b/src/view/com/auth/SplashScreen.tsx @@ -40,16 +40,6 @@ export const SplashScreen = ({ @@ -19,7 +18,7 @@ index 3442d1bdf..dd2d1fdfb 100644 @@ -40,13 +39,10 @@ index 3442d1bdf..dd2d1fdfb 100644 diff --git a/src/view/com/auth/SplashScreen.web.tsx b/src/view/com/auth/SplashScreen.web.tsx --- a/src/view/com/auth/SplashScreen.web.tsx +++ b/src/view/com/auth/SplashScreen.web.tsx -@@ -91,15 +91,6 @@ export const SplashScreen = ({ - {!kawaii && ( - - +@@ -94,14 +94,6 @@ export const SplashScreen = ({ )} -- + - { -- const soundFiles = ['dm.aiff'] -+ const soundFiles = [] - - return withPlugins(config, [ - // IOS diff --git a/plugins/withCodeSignEntitlements.js b/plugins/withCodeSignEntitlements.js new file mode 100644 index 000000000..b03b6bd68