Closed ymherklotz closed 2 months ago
Thanks for the quick response, I've now removed it from system-resources-tabby and system-resources-min and have added the newline. I couldn't see where the if-statement would have to be added for it to be included in those files, as there doesn't seem to be a check for environment
either, but if with these changes the environment.fish
file will be included in the main oss-cad-suite release I guess that is fine.
Thank you for working on this. Was thinking on change on package-linux.sh and package-darwin.sh, since those are executed while packaging and file may be in build or not there depending of so something like next block should be used
if [ -f "${OUTPUT_DIR}${INSTALL_PREFIX}/environment.fish" ]; then
sed "s|___BRANDING___|${BRANDING}|g" -i ${OUTPUT_DIR}${INSTALL_PREFIX}/environment.fish
fi
Ah ok that makes sense, I've now added the checks so it only does the sed
when the file is actually there (so only for the oss-cad-suite flow).
I have re-run build, so if you download linux-x64 realease it will be already updated and you can try if it works fine for you. If you are on macOS you will just need to wait for a bit for build to finish can see status at https://github.com/YosysHQ/oss-cad-suite-build/actions
@mmicko Thanks, I just downloaded the newest version (uploaded a few minutes ago from the release page), but it actually does not seem to contain the environment.fish
file:
tar tf oss-cad-suite-linux-x64-20240515.tgz | grep environment
prints:
oss-cad-suite/lib/python3.11/site-packages/jinja2/__pycache__/environment.cpython-311.pyc
oss-cad-suite/lib/python3.11/site-packages/jinja2/environment.py
oss-cad-suite/environment
Ok I see where problem is. Give me 5 min
@ymherklotz It is fine now, file is now part of tar.gz
@mmicko Thanks a lot, seems to work! sorry I thought I had added the copies in the right places, but now that I look at the commit there weren't any..
Well I told you to remove it from system-resources-tabby.sh that was imported by system-resources.sh but then code needed explicitly to be added to system-resources.sh. All is fine. Thank you for your contribution.
Ah makes sense! Thanks again.
This commit adds support for the fish shell by adding a
environment.fish
file and fixes #104 by adding that feature. It should behave like theenvironment
file for bash and zsh. I have also added documentation in the README for it and have changed all the relevant locations.Let me know if anything requires changing, I could remove it from the minimal installs for example but for now have added it there too.