🔧 Make pod shell respect configured profile (#2)

AstroxNetwork · Nov 27, 2024 · 45ddfe0 · 45ddfe0
1 parent 6937632
commit 45ddfe0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 > Versions prefix will sync with `crate::ordinals`.
 > See https://crates.io/crates/ordinals/versions.
 
+## 0.0.8+4
+
+- Make pod shell respect configured profile on Darwin.
+- Make shell scripts executable.
+
 ## 0.0.8+3
 
 - Support `flutter_rust_bridge` 2.5.

diff --git a/cargokit/build_pod.sh b/cargokit/build_pod.sh
diff --git a/cargokit/run_build_tool.sh b/cargokit/run_build_tool.sh
diff --git a/ios/ord_dart.podspec b/ios/ord_dart.podspec
@@ -25,13 +25,17 @@ Pod::Spec.new do |s|
 
   s.script_phase = {
     :name => 'Build Rust library',
-    # First argument is relative path to the `rust` folder, second is name of rust library
-    :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../rust ord_dart',
     :execution_position => :before_compile,
     :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
     # Let XCode know that the static library referenced in -force_load below is
     # created by this build step.
     :output_files => ["${BUILT_PRODUCTS_DIR}/libord_dart.a"],
+    :shell_path => '/bin/bash',
+    :script => <<-SCRIPT
+    [ -f "$HOME/.profile" ] && source "$HOME/.profile"
+    [ -f "$HOME/.bash_profile" ] && source "$HOME/.bash_profile"
+    "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../rust ord_dart
+    SCRIPT
   }
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',

diff --git a/macos/ord_dart.podspec b/macos/ord_dart.podspec
@@ -24,13 +24,17 @@ Pod::Spec.new do |s|
 
   s.script_phase = {
     :name => 'Build Rust library',
-    # First argument is relative path to the `rust` folder, second is name of rust library
-    :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../rust ord_dart',
     :execution_position => :before_compile,
     :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
     # Let XCode know that the static library referenced in -force_load below is
     # created by this build step.
     :output_files => ["${BUILT_PRODUCTS_DIR}/libord_dart.a"],
+    :shell_path => '/bin/bash',
+    :script => <<-SCRIPT
+    [ -f "$HOME/.profile" ] && source "$HOME/.profile"
+    [ -f "$HOME/.bash_profile" ] && source "$HOME/.bash_profile"
+    "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../rust ord_dart
+    SCRIPT
   }
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: ord_dart
-version: 0.0.8+3
+version: 0.0.8+4
 
 description: "The Flutter plugin that supports Ordinals protocol (Runes protocol only)."
 repository: https://github.com/AstroxNetwork/ord_dart
@@ -13,7 +13,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  flutter_rust_bridge: '>=2.5.0 <2.6.0'
+  flutter_rust_bridge: '>=2.5.0 <2.5.1'
   freezed_annotation: ^2.2.0
   meta: ^1.12.0