From 7e93eb647100115eeed1e87a16b060148ece3aa3 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Wed, 18 May 2022 10:29:13 +0200 Subject: [PATCH 1/5] updated version.sh --- fragments/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/version.sh b/fragments/version.sh index 1a2c355..cdefeb2 100644 --- a/fragments/version.sh +++ b/fragments/version.sh @@ -1 +1 @@ -9.2 +10.0beta From 89c4d4fa5c31fd9e145cbcc7728893eef03f37cd Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Wed, 18 May 2022 17:09:52 +0200 Subject: [PATCH 2/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 83637f6..32c7f0c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,13 +21,13 @@ Make sure you branch off of main for new and updated labels and off of `dev` for ## Labels -If you need a new label for a piece of software, please take a look at the tutorials in the Wiki, if those can be helpful for starting out on the creation of the label. +If you need a new label for a piece of software, please take a look [at the tutorials in the Wiki](https://github.com/Installomator/Installomator/wiki#tutorials), those can be helpful for starting out on the creation of the label. We expect you to try out finding the __version__ of the software online, so that `appNewVersion` can be filled in the label. It helps a lot when the software needs update, and greatly improve user experience. Please document what you found out about the __version__ of the software if it's not included. We will not accept a new label if this is not documented, we will ask about this if it was not included. This is very important for the quality and reliability of Installomator. -When creating a new label, please file a pull request (PR). And feel free to ask questions or make your comments about what else is needed, if we should take a look at the label, or help out in finding the version or isolating URLs or anything else. +When creating a new label, please file a pull request (PR). And feel free to ask questions or make your comments about what else is needed, if we should take a look at the label, or help out in finding the version or isolating URLs or anything else. You can find [a tutorial on how to create a PR here](https://github.com/Installomator/Installomator/wiki/GitHub-howto-create-PRs). Please include the log of installing this label in the description, like this: ``` @@ -39,11 +39,13 @@ Please include the log of installing this label in the description, like this: Please have one label per PR, so we can separate these. Also if you change/fix a label. -Thank you very much for your contribution! +__Thank you very much for your contribution!__ ## Issues Do not create an issue just when you have a questions, but do file an issue or pull request (PR) for bugs or wrong behavior. Include the full log and include the version of Installomator you're running. +Join [the MacAdmins Slack](https://macadmins.org) and find us in the `#intallomator` channel for questions, support and discussions. + When in doubt, use the MacAdmins.org Slack as described in [README.md](https://github.com/Installomator/Installomator/) From dd98c13e405e38f1236492e4a1866d1397dc25ab Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Wed, 18 May 2022 17:21:35 +0200 Subject: [PATCH 3/5] Many new links and clarifications --- CONTRIBUTING.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32c7f0c..2fe5c9f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,23 +1,25 @@ # Contributing to Installomator -__Please note, that if you are contributing to this project with new labels or other suggestions in PRs, please put your changes in the files below `fragments`-folder. DO NOT edit the full `Installomator.sh` script. The full script is now a build of the fragments, and will be overwritten.__ +__Please note, that if you are contributing to this project with new labels or other suggestions in PRs, please put your changes in the files in the `fragments` sub-folder. DO NOT edit the full `Installomator.sh` script. The full script is generated from the fragments, and will be overwritten. More details on [how the script is assembled from the fragments here](https://github.com/Installomator/Installomator/tree/main/utils#how-to-assemble-installomatorsh).__ -We try to keep the script as short as possible, and with more than 300 labels, we can save 300 lines in the script, if we do not have credit lines on each of these. So we are thankful for your contribution, but we will be removing these lines in the coming releases. +We try to keep the script as short as possible, and with more than 400 labels, we can save 400 lines in the script, if we do not have credit lines on each of these. So we are thankful for your contribution, but we will be removing these lines in the coming releases. ## Branches The branch list is as follows: - `release`: this branch will have the latest released version -- `main`: (default) this branch will be the latest release plus new and updated app labels, and critical bug fixes -- `dev`: this will contain new and updated app labels, as well as any other code changes -there will be other branches for new features and testing +- `main`: (default) this branch will be the current build we are working on. It includes new and updated app labels, and critical bug fixes +- `dev`: this will contain new and updated app labels, as well as other code changes that have the risk of significantly changing or breaking behavior +there will be other branches for new features and testing. This should allow the contributing team to release minor updates for new and updated app labels while also work on new features for the next major release. With all the new branches, your local repo may get confused. If you don’t have local changes, it is easiest to delete your local repo and re-clone it. If you have local changes you want to preserve, then you should commit those to a local branch, pull the latest changes `git pull --all`, then delete the old master branch: `git branch -d master`. -Make sure you branch off of main for new and updated labels and off of `dev` for other code changes. Thank you for contributing! +Please make sure you branch off of main for your PRs. + +__Thank you for contributing!__ ## Labels @@ -44,8 +46,8 @@ __Thank you very much for your contribution!__ ## Issues -Do not create an issue just when you have a questions, but do file an issue or pull request (PR) for bugs or wrong behavior. Include the full log and include the version of Installomator you're running. +Do not create an issue just when you have a questions, but do file an issue or pull request (PR) for bugs or wrong behavior. Include the full log and include the version of Installomator you're running. When you create a PR to follow-up and solve an issue make sure to [mention the issue using the `#xxx` syntax in a commit message or comment to link the issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue). -Join [the MacAdmins Slack](https://macadmins.org) and find us in the `#intallomator` channel for questions, support and discussions. +Join [the MacAdmins Slack](https://macadmins.org) and find us in the `#installomator` channel for questions, support and discussions. When in doubt, use the MacAdmins.org Slack as described in [README.md](https://github.com/Installomator/Installomator/) From a22e65614680105d7d2508b115781f5bae9b4874 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Wed, 18 May 2022 17:27:34 +0200 Subject: [PATCH 4/5] Update README.md --- utils/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/utils/README.md b/utils/README.md index dad799a..0808636 100644 --- a/utils/README.md +++ b/utils/README.md @@ -1,6 +1,6 @@ # How to assemble Installomator.sh -Since the Installomator.sh script has grown to over 3000 lines, its management on git has become very unwieldy. The single file with all the logic and the data required to download and install the applications creates constant merge conflicts which add to the workload of the repo admins, especially when part of the team is working on the logic of the script while we still get PRs to add labels. +Since the Installomator.sh script has grown to over 5000 lines, its management on git has become very unwieldy. The single file with all the logic and the data required to download and install the applications creates constant merge conflicts which add to the workload of the repo admins, especially when part of the team is working on the logic of the script while we still get PRs to add labels. Because of that we have split the main script into multiple files which are easier to manage. Having multiple files results in less merge conflicts. @@ -53,7 +53,7 @@ Once you are certain that your new custom label works, you can use the code from The `Installomator.sh` script at the root of the repo does not really get involved in your building and testing. Similarly, if you want to apply, test, and contribute changes to the script's logic, you should modify the fragment file in question and test using the assemble script. -Pull requests against the `Installomator.sh` script in the root of the repo will be rejected. (Excepting the backlog of existing PRs.) +Pull requests against the `Installomator.sh` script in the root of the repo will be rejected. ## How do I contribute new or modified labels back to the Installomator project? @@ -70,11 +70,13 @@ If you have multiple labels (or other changes) you want to contribute, please cr Once your Pull Request is merged into the main repo, you can pull the change to your local repo, push it to your fork, and delete the branch, because it should be fully merged. +When you have multiple labels or changes, please create a separate issue for each label or change, unless they are closely related + + ### When you are not familiar with git and GitHub -Create an Issue in the Installomator repo and include the contents of your custom label file. +We have a tutorial on [How to create Pull Requests in GitHub](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue). -If you have multiple labels, please create a separate issue for each label. ## Fragments @@ -109,7 +111,7 @@ All the contents of the label files in `labels` (and any custom label locations Finally, the `main.sh` fragment contains most of the main logic. -The assemble script does not check _any_ of the files for syntax or completeness. You are responsible that everything fits together properly. (Pay special attention to remember the closing semi-colons `;;` in the label files.) +The assemble script does not check _any_ of the files for syntax or completeness. You are responsible that everything fits together properly. (Pay special attention to remember the closing semi-colons `;;` and a final line break in the label files.) ## assemble.sh Usage From 2a236e9b2c0cea067682b6e9a41968276b00fe60 Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Thu, 19 May 2022 10:23:47 +0200 Subject: [PATCH 5/5] fixed stray whitespace at the end of camtasia2019.sh, closes #547 --- Installomator.sh | 6 +++--- Labels.txt | 1 + fragments/labels/camtasia2019.sh | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Installomator.sh b/Installomator.sh index 4d9f31a..a568068 100755 --- a/Installomator.sh +++ b/Installomator.sh @@ -302,8 +302,8 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then rosetta2=no fi fi -VERSION="9.2" -VERSIONDATE="2022-05-16" +VERSION="10.0beta" +VERSIONDATE="2022-05-19" # MARK: Functions @@ -1859,7 +1859,7 @@ camtasia2019) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2019" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - camtasia2020) +camtasia2020) name="Camtasia 2020" type="dmg" downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) diff --git a/Labels.txt b/Labels.txt index cabdcf4..e294113 100644 --- a/Labels.txt +++ b/Labels.txt @@ -68,6 +68,7 @@ calibre camostudio camtasia camtasia2019 +camtasia2020 camtasia2021 canva chatwork diff --git a/fragments/labels/camtasia2019.sh b/fragments/labels/camtasia2019.sh index 170c056..26ffd61 100644 --- a/fragments/labels/camtasia2019.sh +++ b/fragments/labels/camtasia2019.sh @@ -5,4 +5,3 @@ camtasia2019) appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep "Camtasia (Mac) 2019" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//') expectedTeamID="7TQL462TU8" ;; - \ No newline at end of file