Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix update check for custom repositories #231

Open
kingsleyadam opened this issue Mar 17, 2018 · 3 comments
Open

Fix update check for custom repositories #231

kingsleyadam opened this issue Mar 17, 2018 · 3 comments

Comments

@kingsleyadam
Copy link

Currently if AUTOUPDATE='no' and CHECKUPDATE='yes' the script doesn't respect the GIT_OWNER and BRANCHNAME variables while setting the UPSTREAM_GIT_URL. Instead it reverts to the default owner of mrworf and branchname of master.

Move the setter of UPSTREAM_GIT_URL to plexupdate.sh as it relies on config variables.

@kingsleyadam
Copy link
Author

I have a fix for this but my repo is further ahead of this one due to my pending slack integration. I can submit a pull request if the other is approved.

@demonbane
Copy link
Collaborator

I just looked at your repo to see the code and noticed that #230 is your first PR, so congrats!

A few quick suggestions for saving yourself a lot of aggravation when contributing to projects (from personal experience):

  • Try to always keep your fork's master in sync with upstream
  • Make any changes on a topic branch
  • Open PRs with the upstream project rather than doing a PR on your own project, and then sending a PR for master to upstream
  • If you're still working on the code and just want to get some more people looking at it, add [WIP] to the description so we know it's not ready to merge yet
  • Git is really good at merging potentially conflicting changes, so don't be afraid to have two different PRs going at the same time

@kingsleyadam
Copy link
Author

Thanks for the tips. I realized my mistake right after I merged into my own master. I'm not quite used to working in forked branches so this is good to know. I reverted my commits, this adds new commits which isn't pretty. If you'd rather I scrap the fork and start over I can. There's not too many changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants