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.

Sign up for GitHub

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

Jump to bottom

cleaned up the code #1

Merged
merged 4 commits into from Apr 25, 2020
Merged

cleaned up the code #1

merged 4 commits into from Apr 25, 2020

Conversation

sdushantha
Copy link
Contributor

  • portable bash shebang
  • more portable functions
  • made one of the if statements a oneliner
  • put quotes around some variables to prevent globing

@sdushantha
cleaned up the code
8505159 
- portable bash shebang
- more portable functions
- made one of the if statements a oneliner
- put quotes around some variables to prevent globing
@adi1090x
Copy link
Owner

@sdushantha, good job but sorry i can't merge it due to conflicts.
can i use the code, i just manually have to edit the source code?

@sdushantha
Copy link
Contributor Author

i can't merge it due to conflicts.

@adi1090x That is very strange, because everything seems fine on my end and ready to be merged.
image

I am more than happy to create a new PR after forking the latest version, if you keep encountering this problem.

@adi1090x
Copy link
Owner

As you can see, there are two PR's here & i want both, so sure there will be conflicts.
also i made few changes locally that i haven't pushed yet.

@sdushantha
Copy link
Contributor Author

If you push the changes that you made made locally, and then merge #2 I can make the needed changes, to resolve the conflicts 👍
If the changes made by @megasyl causes conflicts, I'm sure it can easily be resolved with teamwork :)

@adi1090x
Copy link
Owner

Alright, i've pushed the local changes i've made, mixing your and @megasyl code.
review it and make it better if you can.

@sdushantha
updated code to latest version
fe93249
@sdushantha
use && instead of ;
0edf587 
Using && would be wiser because if you use ";" and the command before failes, there would be a "pause" for 60 seconds for no reason
@sdushantha
Merge branch 'master' into patch-1
d394d23
@sdushantha
Copy link
Contributor Author

I have resolved the conflicts. It looks like you already used my edits when you updated the code locally, therefore the only difference now is 0edf587

@adi1090x adi1090x merged commit 9189a4f into adi1090x:master Apr 25, 2020
@adi1090x
Copy link
Owner

adi1090x commented Apr 25, 2020 •
edited

do you have a mac?
i was just wondering if you can add mac-os support, it's similar to this, but i can't test it so i haven't included that.

@sdushantha
Copy link
Contributor Author

@adi1090x I do have a Macbook, but I currently don't have access to it, so I unfortunately can not test it at the moment.

@sdushantha sdushantha deleted the patch-1 branch April 26, 2020 05:47
ghost pushed a commit to Kagia001/dynamic-wallpaper that referenced this pull request Apr 27, 2021
merge: Big Sur Wallpapers
3f3c015 
Pull Request adi1090x#1 by @egemertdogan
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sdushantha @adi1090x