Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
fa066da7
Unverified
Commit
fa066da7
authored
5 years ago
by
Jan-Christoph Borchardt
Browse files
Options
Downloads
Patches
Plain Diff
Fix app update script for macOS
Signed-off-by:
Jan-Christoph Borchardt
<
hey@jancborchardt.net
>
parent
8f0656aa
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build/update-apps.sh
+1
-1
1 addition, 1 deletion
build/update-apps.sh
build/update.sh
+1
-1
1 addition, 1 deletion
build/update.sh
with
2 additions
and
2 deletions
build/update-apps.sh
+
1
−
1
View file @
fa066da7
...
@@ -11,4 +11,4 @@
...
@@ -11,4 +11,4 @@
# - removes branches merged into master
# - removes branches merged into master
# - … could even do the build steps if they are consistent for the apps (like `make`)
# - … could even do the build steps if they are consistent for the apps (like `make`)
find apps
*
-maxdepth
2
-name
.git
-exec
sh
-c
'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout master && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged master | grep -v "master$" | xargs
--no-run-if-empty
git branch -d && cd ..'
\;
find apps
*
-maxdepth
2
-name
.git
-exec
sh
-c
'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout master && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged master | grep -v "master$" | xargs git branch -d && cd ..'
\;
This diff is collapsed.
Click to expand it.
build/update.sh
+
1
−
1
View file @
fa066da7
...
@@ -9,7 +9,7 @@ git checkout master
...
@@ -9,7 +9,7 @@ git checkout master
git pull
--quiet
-p
git pull
--quiet
-p
git
--no-pager
log
-3
--pretty
=
format:
"%h %Cblue%ar%x09%an %Creset%s"
git
--no-pager
log
-3
--pretty
=
format:
"%h %Cblue%ar%x09%an %Creset%s"
printf
"
\n
"
printf
"
\n
"
git branch
--merged
master |
grep
-v
"master$"
| xargs
--no-run-if-empty
git branch
-d
git branch
--merged
master |
grep
-v
"master$"
| xargs git branch
-d
git submodule update
--init
git submodule update
--init
# Update apps
# Update apps
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment