From 4ba165f5bab0c91298699cf9432405e37e95d197 Mon Sep 17 00:00:00 2001 From: bjornoleh <63544115+bjornoleh@users.noreply.github.com> Date: Tue, 14 May 2024 00:03:36 +0200 Subject: [PATCH 1/5] Update README.md: Create ConfigOverride.xcconfig by command line --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ad0dcb263..d25bf0b6b 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,15 @@ git clone --branch=<> --recurse-submodules https://github.com/nightscout cd Trio ``` -modify Config.xconfig to replace ##TEAM_ID## with your Apple Developer ID. +Create an ConfigOverride.xcconfig file that will automate signing of the build targets in Xcode: +``` +echo 'DEVELOPER_TEAM = xxxxxxxxxx' > ConfigOverride.xcconfig +``` + +Modify the Config.xconfig to replace `xxxxxxxxxx` with your Apple Developer ID. You can do this from within Xcode, or by using some other text editor. + +Then launch Xcode and build the Trio app: ``` xed . ``` From 8dfbb2625fa0e92e6df25d0f4546781bb17b4e0e Mon Sep 17 00:00:00 2001 From: bjornoleh Date: Tue, 14 May 2024 18:32:35 +0200 Subject: [PATCH 2/5] README.md: adjust CLI method for creation of ConfigOverride --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d25bf0b6b..402f1f926 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,13 @@ git clone --branch=<> --recurse-submodules https://github.com/nightscout cd Trio ``` -Create an ConfigOverride.xcconfig file that will automate signing of the build targets in Xcode: +Create a ConfigOverride.xcconfig file that contains your Apple Developer ID (something like `123A4BCDE5`). This will automate signing of the build targets in Xcode: +Copy the command below, and replace `xxxxxxxxxx` by your Apple Developer ID before running the command in Terminal. ``` echo 'DEVELOPER_TEAM = xxxxxxxxxx' > ConfigOverride.xcconfig ``` -Modify the Config.xconfig to replace `xxxxxxxxxx` with your Apple Developer ID. You can do this from within Xcode, or by using some other text editor. - Then launch Xcode and build the Trio app: ``` xed . From d934d4cad64cd1d353cb256c25f15164268af8d8 Mon Sep 17 00:00:00 2001 From: Mike Plante <82073483+MikePlante1@users.noreply.github.com> Date: Tue, 14 May 2024 15:35:34 -0400 Subject: [PATCH 3/5] Add Build Script to README --- README.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 402f1f926..442f7869a 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,23 @@ Trio continues to leverage a variety of frameworks from the DIY looping communit ## To download this repo: -There is also a script available, but if you prefer the manual process: +You can either use the Build Script or you can run each command manually. -In Terminal: +### Build Script: -Configure a folder where you want your download to reside: +If you copy, paste, and run the following script in Terminal, it will guide you through downloading and installing Trio. More information about the script can be found [here](https://docs.diy-trio.org/en/latest/operate/build.html#build-trio-with-script). ``` -cd -git clone --branch=<> --recurse-submodules https://github.com/nightscout/Trio.git +/bin/bash -c "$(curl -fsSL \ + https://raw.githubusercontent.com/loopandlearn/lnl-scripts/main/TrioBuildSelectScript.sh)" +``` + +### Command Line Interface (CLI): + +In Terminal, `cd` to the folder where you want your download to reside, change `` in the command below to the branch you want to download (ie. `dev`), and press `return`. + +``` +git clone --branch= --recurse-submodules https://github.com/nightscout/Trio.git cd Trio ``` From f6fa0c2486ceb2c69502fd9dc112eb282fc38cc9 Mon Sep 17 00:00:00 2001 From: Mike Plante <82073483+MikePlante1@users.noreply.github.com> Date: Tue, 14 May 2024 16:13:58 -0400 Subject: [PATCH 4/5] Add URLs in README.md Docs, FAX, Oref0 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 442f7869a..563c83892 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Trio - an automated insulin delivery system for iOS based on the OpenAPS algorithm with [adaptations for Trio](https://github.com/nightscout/trio-oref). -The project started as Ivan Valkou's FreeAPS X implementation of the OpenAPS algorithm for iPhone, and was later forked and rebranded as iAPS. The project has since seen substantial contributions from many developers, leading to a range of new features and enhancements. +The project started as Ivan Valkou's [FreeAPS X](https://github.com/ivalkou/freeaps) implementation of the [OpenAPS algorithm](https://github.com/openaps/oref0) for iPhone, and was later forked and rebranded as iAPS. The project has since seen substantial contributions from many developers, leading to a range of new features and enhancements. Following the release of iAPS version 3.0.0, due to differing views on development, open source, and peer review, there was a significant shift in the project's direction. This led to the separation from the [Artificial-Pancreas/iAPS](https://github.com/Artificial-Pancreas/iAPS) repository, and the birth of [Trio](https://github.com/nightscout/Trio.git) as a distinct entity. This transition marks a new phase for the project, symbolizing both its evolution and the dynamic nature of collaborative development. @@ -66,7 +66,7 @@ Instructions in greater detail, but not Trio-specific: [Discord Trio - Server ](https://discord.gg/KepAG6RdYZ) -TODO: Add link: Trio documentation (under development, not existing yet) +[Trio documentation](https://docs.diy-trio.org/en/latest/) TODO: Add link: Trio Website (under development, not existing yet) From 380d3c06e57c8ce294582ab544ce93bed6c2888e Mon Sep 17 00:00:00 2001 From: LiroyvH Date: Tue, 14 May 2024 17:06:22 -0400 Subject: [PATCH 5/5] combine clone commands into a single line both single and double line versions worked in zsh, but only the single line version worked in bash --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 563c83892..56af6b2fb 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,7 @@ If you copy, paste, and run the following script in Terminal, it will guide you In Terminal, `cd` to the folder where you want your download to reside, change `` in the command below to the branch you want to download (ie. `dev`), and press `return`. ``` -git clone --branch= --recurse-submodules https://github.com/nightscout/Trio.git -cd Trio +git clone --branch= --recurse-submodules https://github.com/nightscout/Trio.git && cd Trio ``` Create a ConfigOverride.xcconfig file that contains your Apple Developer ID (something like `123A4BCDE5`). This will automate signing of the build targets in Xcode: