Skip to content

URL-Handling / .gitignore#346

Merged
guysoft merged 1 commit intoguysoft:develfrom
Arrow768:2020-08-14-unifi-url-handling
Oct 18, 2020
Merged

URL-Handling / .gitignore#346
guysoft merged 1 commit intoguysoft:develfrom
Arrow768:2020-08-14-unifi-url-handling

Conversation

@Arrow768
Copy link
Contributor

@Arrow768 Arrow768 commented Aug 14, 2020

This PR addresses a few issues I found while working on a custom variant of fullpageos.

.gitignore file

The gitignore file is updated to ignore custom variants (except for the example variant) as well as workspaces of custom variants.

url handling

Multiple scripts use some type of URL with quite a few different ways this is handled:

  • run_onepageos has the following URL hardcoded: http://localhost/FullPageDashboard
    • This prevents fullpageos from working if FullPageDashboard or the local webserver is not included in the image
  • safe_refresh uses $(cat /boot/fullpageos.txt)
    • This might cause issues / inconsistent behaviour if there is more than one line in the fullpageos.txt (I did not test if that actually causes issues but replaced it regardless)
  • start_chromium_browser uses $(head -n 1 /boot/fullpageos.txt | sed -e "s/{serial}/${SERIAL}/g"
    • This is what is now used in the get_url script

* Updates the .gitignore file to ignore custom variants (except for the example variant provided as well as custom workspace folders
* Unifies the way the displayed URL is acquired
@Arrow768 Arrow768 changed the title URL URL-Handling / .gitignore URL-Handling / .gitignore Aug 14, 2020
@stappersg
Copy link
Contributor

stappersg commented Oct 11, 2020

Please split the merge request in two separate merge requests.

@guysoft
Copy link
Owner

guysoft commented Oct 18, 2020

@stappersg Why are you asking for this to be split?

@guysoft
Copy link
Owner

guysoft commented Oct 18, 2020

Seems good to me and will merge. Just waiting a little bit more to get a reply from @stappersg if he/she sees something I am not.

@stappersg
Copy link
Contributor

Why the split request?

To have commits that only change one thing at a time.
As in the habit of good software development.

@guysoft
Copy link
Owner

guysoft commented Oct 18, 2020

Indeed its good practice. And if I would want to merge only one of the changes I would ask that. However the developer count is so low (aka I am the only maintainer), that bundling up saves time. When we have a massive developer pool it would make more sense.

@guysoft guysoft merged commit 7d480ec into guysoft:devel Oct 18, 2020
dwarf6 pushed a commit to dwarf6/FullPageOS64 that referenced this pull request Feb 19, 2026
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 this pull request may close these issues.

3 participants