Skip to content

Handle unset ${HOME} gracefully #79

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Handle unset ${HOME} gracefully #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d6a53e
indent package scripts for improved readability
attie Aug 5, 2023
a599656
rearrange environment variables, to group those derrived from ${HOME}
attie Aug 5, 2023
5bfc077
quote strings to avoid issues with spaces
attie Aug 5, 2023
2f4c932
protect against use of unset ${HOME}
attie Aug 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
260 changes: 133 additions & 127 deletions scripts/package-darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,120 +20,124 @@ for bindir in bin py3bin super_prove/bin share/verilator/bin lib/ivl; do

mv $binfile libexec
is_using_fonts=false
cat > $binfile << EOT
#!/usr/bin/env bash
release_bindir="\$(dirname "\${BASH_SOURCE[0]}")"
release_bindir_abs="\$("\$release_bindir"/$rel_path/libexec/realpath "\$release_bindir")"
release_topdir_abs="\$("\$release_bindir"/$rel_path/libexec/realpath "\$release_bindir/$rel_path")"
export PATH="\$release_bindir_abs:\$PATH"
EOT
cat > $binfile <<-EOT
#!/usr/bin/env bash
release_bindir="\$(dirname "\${BASH_SOURCE[0]}")"
release_bindir_abs="\$("\$release_bindir"/$rel_path/libexec/realpath "\$release_bindir")"
release_topdir_abs="\$("\$release_bindir"/$rel_path/libexec/realpath "\$release_bindir/$rel_path")"
export PATH="\$release_bindir_abs:\$PATH"
EOT
if [ $bindir == 'py3bin' ]; then
cat >> $binfile << EOT
export PYTHONEXECUTABLE="\$release_topdir_abs/bin/tabbypy3"
EOT
cat >> $binfile <<-EOT
export PYTHONEXECUTABLE="\$release_topdir_abs/bin/tabbypy3"
EOT
fi
if [ ! -z "$(basename $binfile | grep verilator)" ]; then
cat >> $binfile << EOT
export VERILATOR_ROOT="\$release_topdir_abs/share/verilator"
EOT
cat >> $binfile <<-EOT
export VERILATOR_ROOT="\$release_topdir_abs/share/verilator"
EOT
fi
if [ ! -z "$(basename $binfile | grep openFPGALoader)" ]; then
cat >> $binfile << EOT
export OPENFPGALOADER_SOJ_DIR="\$release_topdir_abs/share/openFPGALoader"
EOT
cat >> $binfile <<-EOT
export OPENFPGALOADER_SOJ_DIR="\$release_topdir_abs/share/openFPGALoader"
EOT
fi
if [ ! -z "$(basename $binfile | grep iverilog)" ]; then
cat >> $binfile << EOT
set -- "-p" "VVP_EXECUTABLE=\$release_topdir_abs/bin/vvp" "\$@"
EOT
cat >> $binfile <<-EOT
set -- "-p" "VVP_EXECUTABLE=\$release_topdir_abs/bin/vvp" "\$@"
EOT
fi
if [ ! -z "$(basename $binfile | grep ghdl)" ]; then
cat >> $binfile << EOT
export GHDL_PREFIX="\$release_topdir_abs/lib/ghdl"
EOT
cat >> $binfile <<-EOT
export GHDL_PREFIX="\$release_topdir_abs/lib/ghdl"
EOT
fi
if [ ! -z "$(otool -L libexec/$(basename $binfile) | grep python)" ]; then
cat >> $binfile << EOT
export PYTHONHOME="\$release_topdir_abs"
export PYTHONNOUSERSITE=1
export SSL_CERT_FILE="\$release_topdir_abs"/etc/cacert.pem
EOT
cat >> $binfile <<-EOT
export PYTHONHOME="\$release_topdir_abs"
export PYTHONNOUSERSITE=1
export SSL_CERT_FILE="\$release_topdir_abs"/etc/cacert.pem
EOT
fi
if [ ! -z "$(otool -L libexec/$(basename $binfile) | grep tcl)" ]; then
cat >> $binfile << EOT
export TCL_LIBRARY="\$release_topdir_abs/lib/tcl8.6"
export TK_LIBRARY="\$release_topdir_abs/lib/tk8.6"
EOT
cat >> $binfile <<-EOT
export TCL_LIBRARY="\$release_topdir_abs/lib/tcl8.6"
export TK_LIBRARY="\$release_topdir_abs/lib/tk8.6"
EOT
fi
if [ ! -z "$(otool -L libexec/$(basename $binfile) | grep QtCore)" ]; then
install_name_tool -add_rpath @executable_path/../Frameworks libexec/$(basename $binfile)
if [ ${ARCH} == 'darwin-arm64' ]; then
rcodesign sign libexec/$(basename $binfile)
fi
cat >> $binfile << EOT
export QT_PLUGIN_PATH="\$release_topdir_abs/lib/qt5/plugins"
export QT_LOGGING_RULES="*=false"
unset QT_QPA_PLATFORMTHEME
unset QT_STYLE_OVERRIDE
export XDG_DATA_DIRS="\$release_topdir_abs"/share
export XDG_CONFIG_DIRS="\$release_topdir_abs"
export XDG_CONFIG_HOME=\$HOME/.config/yosyshq
export XDG_CACHE_HOME=\$HOME/.cache/yosyshq
export XDG_DATA_HOME=\$HOME/.local/share/yosyshq
export LC_ALL="C"
mkdir -p \$HOME/.config/yosyshq \$HOME/.local/share/yosyshq
EOT
cat >> $binfile <<-EOT
export QT_PLUGIN_PATH="\$release_topdir_abs/lib/qt5/plugins"
export QT_LOGGING_RULES="*=false"
unset QT_QPA_PLATFORMTHEME
unset QT_STYLE_OVERRIDE
export LC_ALL="C"
export XDG_DATA_DIRS="\$release_topdir_abs"/share
export XDG_CONFIG_DIRS="\$release_topdir_abs"
if [ ! -z ${HOME:+x} ]; then
export XDG_CONFIG_HOME="\$HOME/.config/yosyshq"
export XDG_CACHE_HOME="\$HOME/.cache/yosyshq"
export XDG_DATA_HOME="\$HOME/.local/share/yosyshq"
mkdir -p "\$HOME/.config/yosyshq" "\$HOME/.local/share/yosyshq"
fi
EOT
fi
if [ ! -z "$(otool -L libexec/$(basename $binfile) | grep libgtk)" ]; then
# Set and unset variables according to:
# https://refspecs.linuxbase.org/gtk/2.6/gtk/gtk-running.html
# https://specifications.freedesktop.org/basedir-spec/0.6/ar01s03.html
cat >> $binfile << EOT
unset GTK_MODULES
unset GTK2_MODULES
#unset GTK3_MODULES
export GTK_PATH="\$release_topdir_abs/lib"
export GTK_IM_MODULE=""
export GTK_IM_MODULE_FILE="/dev/null"
export GTK2_RC_FILES="\$release_topdir_abs/lib/gtkrc"
export GTK_EXE_PREFIX="\$release_topdir_abs"
export GTK_DATA_PREFIX="\$release_topdir_abs"
export GDK_PIXBUF_MODULEDIR="\$release_topdir_abs/lib/gdk-pixbuf-2.0/loaders"
#export GTK_THEME="Adwaita"
export XDG_DATA_DIRS="\$release_topdir_abs"/share
export XDG_CONFIG_DIRS="\$release_topdir_abs"
export XDG_CONFIG_HOME=\$HOME/.config/yosyshq
export XDG_CACHE_HOME=\$HOME/.cache/yosyshq
export XDG_DATA_HOME=\$HOME/.local/share/yosyshq
export LC_ALL="C"
export TCL_LIBRARY="\$release_topdir_abs/lib/tcl8.6"
export TK_LIBRARY="\$release_topdir_abs/lib/tk8.6"
export GDK_PIXBUF_MODULE_FILE="\$XDG_CACHE_HOME/loaders.cache"
mkdir -p \$XDG_CONFIG_HOME \$XDG_CACHE_HOME \$XDG_DATA_HOME
"\$release_topdir_abs"/libexec/gdk-pixbuf-query-loaders --update-cache
EOT
# Set and unset variables according to:
# https://refspecs.linuxbase.org/gtk/2.6/gtk/gtk-running.html
# https://specifications.freedesktop.org/basedir-spec/0.6/ar01s03.html
cat >> $binfile <<-EOT
unset GTK_MODULES
unset GTK2_MODULES
#unset GTK3_MODULES
export GTK_PATH="\$release_topdir_abs/lib"
export GTK_IM_MODULE=""
export GTK_IM_MODULE_FILE="/dev/null"
export GTK2_RC_FILES="\$release_topdir_abs/lib/gtkrc"
export GTK_EXE_PREFIX="\$release_topdir_abs"
export GTK_DATA_PREFIX="\$release_topdir_abs"
export GDK_PIXBUF_MODULEDIR="\$release_topdir_abs/lib/gdk-pixbuf-2.0/loaders"
#export GTK_THEME="Adwaita"
export TCL_LIBRARY="\$release_topdir_abs/lib/tcl8.6"
export TK_LIBRARY="\$release_topdir_abs/lib/tk8.6"
export LC_ALL="C"
export XDG_DATA_DIRS="\$release_topdir_abs"/share
export XDG_CONFIG_DIRS="\$release_topdir_abs"
if [ ! -z ${HOME:+x} ]; then
export XDG_CONFIG_HOME="\$HOME/.config/yosyshq"
export XDG_CACHE_HOME="\$HOME/.cache/yosyshq"
export XDG_DATA_HOME="\$HOME/.local/share/yosyshq"
export GDK_PIXBUF_MODULE_FILE="\$XDG_CACHE_HOME/loaders.cache"
mkdir -p "\$XDG_CONFIG_HOME" "\$XDG_CACHE_HOME" "\$XDG_DATA_HOME"
fi
"\$release_topdir_abs"/libexec/gdk-pixbuf-query-loaders --update-cache
EOT
fi

if [ $binfile == "bin/yosys" ]; then
cat >> $binfile << EOT
export TERMINFO="\$release_topdir_abs/share/terminfo"
EOT
cat >> $binfile <<-EOT
export TERMINFO="\$release_topdir_abs/share/terminfo"
EOT
fi

if [ ${PRELOAD} == 'True' ]; then
if [ $binfile == "bin/yosys" ] || [ $binfile == "bin/tabbylic" ]; then
echo "Skipping"
else
cat >> $binfile << EOT
DYLD_INSERT_LIBRARIES="\$release_topdir_abs"/lib/preload.o exec "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
EOT
cat >> $binfile <<-EOT
DYLD_INSERT_LIBRARIES="\$release_topdir_abs"/lib/preload.o exec "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
EOT
chmod +x $binfile
continue
fi
fi
cat >> $binfile << EOT
exec "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
EOT
cat >> $binfile <<-EOT
exec "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
EOT
chmod +x $binfile
done
done
Expand All @@ -148,49 +152,51 @@ for script in bin/* py3bin/*; do
rel_path=$(realpath --relative-to=bin .)
if $(head -1 "${script}" | grep -q python3); then
mv "${script}" libexec
cat > "${script}" <<EOT
#!/usr/bin/env bash
release_bindir="\$(dirname "\${BASH_SOURCE[0]}")"
release_bindir_abs="\$("\$release_bindir"/../libexec/realpath "\$release_bindir/../bin")"
release_topdir_abs="\$("\$release_bindir"/../libexec/realpath "\$release_bindir/$rel_path")"
export PATH="\$release_bindir_abs:\$PATH"
export PYTHONEXECUTABLE="\$release_bindir_abs/tabbypy3"
EOT
cat > "${script}" <<-EOT
#!/usr/bin/env bash
release_bindir="\$(dirname "\${BASH_SOURCE[0]}")"
release_bindir_abs="\$("\$release_bindir"/../libexec/realpath "\$release_bindir/../bin")"
release_topdir_abs="\$("\$release_bindir"/../libexec/realpath "\$release_bindir/$rel_path")"
export PATH="\$release_bindir_abs:\$PATH"
export PYTHONEXECUTABLE="\$release_bindir_abs/tabbypy3"
EOT
if [ $script == 'bin/xdot' ]; then
# Set and unset variables according to:
# https://refspecs.linuxbase.org/gtk/2.6/gtk/gtk-running.html
# https://specifications.freedesktop.org/basedir-spec/0.6/ar01s03.html
cat >> "${script}" <<EOT
unset GTK_MODULES
unset GTK3_MODULES
export GTK_PATH="\$release_topdir_abs/lib"
export GTK_IM_MODULE=""
export GTK_IM_MODULE_FILE="/dev/null"
export GTK_EXE_PREFIX="\$release_topdir_abs"
export GTK_DATA_PREFIX="\$release_topdir_abs"
export GDK_PIXBUF_MODULEDIR="\$release_topdir_abs/lib/gdk-pixbuf-2.0/loaders"
export GTK_THEME="Adwaita"
export XDG_DATA_DIRS="\$release_topdir_abs"/share
export XDG_CONFIG_DIRS="\$release_topdir_abs"
export XDG_CONFIG_HOME=\$HOME/.config/yosyshq
export XDG_CACHE_HOME=\$HOME/.cache/yosyshq
export XDG_DATA_HOME=\$HOME/.local/share/yosyshq
export TCL_LIBRARY="\$release_topdir_abs/lib/tcl8.6"
export TK_LIBRARY="\$release_topdir_abs/lib/tk8.6"
export LC_ALL="C"
export GI_TYPELIB_PATH="\$release_topdir_abs/lib/girepository-1.0"
export LD_LIBRARY_PATH="\$release_topdir_abs/lib"
export PYTHONHOME="\$release_topdir_abs"
export PYTHONNOUSERSITE=1
export GDK_PIXBUF_MODULE_FILE="\$XDG_CACHE_HOME/loaders.cache"
mkdir -p \$XDG_CONFIG_HOME \$XDG_CACHE_HOME \$XDG_DATA_HOME
"\$release_topdir_abs"/libexec/gdk-pixbuf-query-loaders --update-cache
exec "\$release_topdir_abs"/libexec/python3.8 "\$release_topdir_abs"/libexec/$(basename $script) "\$@"
EOT
# Set and unset variables according to:
# https://refspecs.linuxbase.org/gtk/2.6/gtk/gtk-running.html
# https://specifications.freedesktop.org/basedir-spec/0.6/ar01s03.html
cat >> "${script}" <<-EOT
unset GTK_MODULES
unset GTK3_MODULES
export GTK_PATH="\$release_topdir_abs/lib"
export GTK_IM_MODULE=""
export GTK_IM_MODULE_FILE="/dev/null"
export GTK_EXE_PREFIX="\$release_topdir_abs"
export GTK_DATA_PREFIX="\$release_topdir_abs"
export GDK_PIXBUF_MODULEDIR="\$release_topdir_abs/lib/gdk-pixbuf-2.0/loaders"
export GTK_THEME="Adwaita"
export GI_TYPELIB_PATH="\$release_topdir_abs/lib/girepository-1.0"
export TCL_LIBRARY="\$release_topdir_abs/lib/tcl8.6"
export TK_LIBRARY="\$release_topdir_abs/lib/tk8.6"
export PYTHONHOME="\$release_topdir_abs"
export PYTHONNOUSERSITE=1
export LC_ALL="C"
export LD_LIBRARY_PATH="\$release_topdir_abs/lib"
export XDG_DATA_DIRS="\$release_topdir_abs"/share
export XDG_CONFIG_DIRS="\$release_topdir_abs"
if [ ! -z ${HOME:+x} ]; then
export XDG_CONFIG_HOME="\$HOME/.config/yosyshq"
export XDG_CACHE_HOME="\$HOME/.cache/yosyshq"
export XDG_DATA_HOME="\$HOME/.local/share/yosyshq"
export GDK_PIXBUF_MODULE_FILE="\$XDG_CACHE_HOME/loaders.cache"
mkdir -p "\$XDG_CONFIG_HOME" "\$XDG_CACHE_HOME" "\$XDG_DATA_HOME"
fi
"\$release_topdir_abs"/libexec/gdk-pixbuf-query-loaders --update-cache
exec "\$release_topdir_abs"/libexec/python3.8 "\$release_topdir_abs"/libexec/$(basename $script) "\$@"
EOT
else
cat >> "${script}" <<EOT
exec \$release_bindir_abs/tabbypy3 "\$release_topdir_abs"/libexec/$(basename $script) "\$@"
EOT
cat >> "${script}" <<-EOT
exec \$release_bindir_abs/tabbypy3 "\$release_topdir_abs"/libexec/$(basename $script) "\$@"
EOT
fi
chmod +x "${script}"
fi
Expand All @@ -210,12 +216,12 @@ fi

if [ -f "bin/yosys-config" ]; then
mv bin/yosys-config bin/yosys-config.orig
cat > bin/yosys-config << EOT
#!/usr/bin/env bash
release_bindir="\$(dirname "\${BASH_SOURCE[0]}")"
release_bindir_abs="\$("\$release_bindir"/../libexec/realpath "\$release_bindir")"
release_topdir_abs="\$("\$release_bindir"/../libexec/realpath "\$release_bindir/$rel_path")"
EOT
cat > bin/yosys-config <<-EOT
#!/usr/bin/env bash
release_bindir="\$(dirname "\${BASH_SOURCE[0]}")"
release_bindir_abs="\$("\$release_bindir"/../libexec/realpath "\$release_bindir")"
release_topdir_abs="\$("\$release_bindir"/../libexec/realpath "\$release_bindir/$rel_path")"
EOT
cat bin/yosys-config.orig >> bin/yosys-config
rm bin/yosys-config.orig
sed -i "s,\"/yosyshq,\${release_topdir_abs}\",g" bin/yosys-config
Expand Down
Loading