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 echo in top-level Makefile for some environments #1737

Merged
merged 2 commits into from
Jul 9, 2023

Conversation

ia
Copy link
Collaborator

@ia ia commented Jul 9, 2023

  • Please check if the PR fulfills these requirements
  • The changes have been tested locally
  • There are no breaking changes
  • What kind of change does this PR introduce?
    Fix a tiny bug in the top-level Makefile.

  • What is the current behavior?
    In some environments (such as docker shell inside alpine 3.16) instead of transforming escape sequences on output respectively, output shows \ts and \n's as is.

  • What is the new behavior (if this is a feature change)?
    Replace \ts and \n's by spaces and outputs of new lines explicitly.

  • Other information:
    Also I took some liberty to switch WORKDIR for the container. Currently, after you start a docker shell and want to do something with sources, you must manually do extra command (like cd source) to jump into source tree to keep working with scripts & sources. This little change eliminates that by allowing seamlessly keep using exactly the same make / ./scripts/ commands as if you wouldn't left the current IronOS source tree directory on host, i.e.:

  • current behavior:
(host) $ ./scripts/deploy.sh
(docker) $ cd source/
(docker) $ make firmware-EN model=TS100

vs

  • proposed behavior:
(host) $ ./scripts/deploy.sh
(docker) $ make firmware-EN model=TS100

As far as I understand from official docker documentation, WORKDIR is usually used to avoid providing absolute path for docker file commands such as COPY, but since in IronOS Dockerfile COPY commands are copying files using absolute paths for destinations inside of a container, then such change shouldn't break anything but it will be way much convenient on jumping to the container from source tree.

ia added 2 commits July 9, 2023 14:07
…th explicit formatting by spaces and new lines
…R to IronOS source tree root dir for the seamless workflow
@Ralim Ralim merged commit 311dbea into Ralim:dev Jul 9, 2023
13 checks passed
@ia ia deleted the make-echo-fix branch July 11, 2023 17:36
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.

None yet

2 participants