commit 2146d856c16f06d940803bbd9b873d1142a665f5 parent 6ed17f80ac5694ac442fdd991f46c1db47a85475 Author: Ilia Bozhinov <ammen99@gmail.com> Date: Fri, 27 Mar 2020 16:06:24 +0100 install.sh: set install prefix as first thing in the PATH Otherwise, we may get conflicts with installations in /usr Diffstat:
| M | install.sh | | | 4 | ++-- |
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install.sh b/install.sh @@ -155,8 +155,8 @@ install_config wf-shell.ini $BUILDROOT/wf-shell/wf-shell.ini.example # Generate a startup script, setting necessary env vars. cp $BUILDROOT/start_wayfire.sh.in $BUILDROOT/start_wayfire.sh if [ ${PREFIX} != '/usr' ]; then - sed -i "s@^LD_.*@export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${PREFIX}/${DEST_LIBDIR}@g" $BUILDROOT/start_wayfire.sh - sed -i "s@^PATH.*@export PATH=\$PATH:${PREFIX}/bin@g" $BUILDROOT/start_wayfire.sh + sed -i "s@^LD_.*@export LD_LIBRARY_PATH=${PREFIX}/${DEST_LIBDIR}:\$LD_LIBRARY_PATH@g" $BUILDROOT/start_wayfire.sh + sed -i "s@^PATH.*@export PATH=${PREFIX}/bin:\$PATH@g" $BUILDROOT/start_wayfire.sh fi chmod 755 $BUILDROOT/start_wayfire.sh $SUDO cp $BUILDROOT/start_wayfire.sh $PREFIX/bin/startwayfire