Skip to content

Minor fixes #2

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

Merged
ammen99 merged 4 commits into from
Mar 24, 2020
Merged

Minor fixes #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
599b168
install.sh: Don't use sudo if sudo isn't available
soreau Mar 24, 2020
06f8a6d
install.sh: Set CAP_SYS_ADMIN if neither systemd nor elogind is found
soreau Mar 24, 2020
af11c9c
install.sh: Use path where the script lives as the build root
soreau Mar 24, 2020
dfbd374
install.sh: Install start_wayfire.sh as /bin/startwayfire
soreau Mar 24, 2020
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
11 changes: 8 additions & 3 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fi
echo "Building Wayfire $STREAM"
echo "Installation prefix: $PREFIX"

BUILDROOT=$(pwd)
BUILDROOT="$(cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)"
function ask_confirmation {
while true; do
read -p "$1" yn
Expand All @@ -80,7 +80,7 @@ function ask_confirmation {

# Usually we use sudo, but if prefix is somewhere in ~/, we don't need sudo
SUDO=sudo
if [ -w $PREFIX ]; then
if [ -w $PREFIX ] || ! which sudo > /dev/null; then
SUDO=
fi

Expand Down Expand Up @@ -121,6 +121,10 @@ PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX}/${DEST_LIBDIR}/pkgconfig meson build
ninja -C build
$SUDO ninja -C build install

if ! pkg-config --exists libsystemd && ! pkg-config --exists libelogind && pkg-config --exists libcap; then
$SUDO setcap cap_sys_admin=eip "$PREFIX/bin/wayfire"
fi

# Install a minimalistic, but still usable configuration
# First argument is the name of the file
# Second argument is the name of the template
Expand Down Expand Up @@ -154,8 +158,9 @@ if [ ${PREFIX} != '/usr' ]; then
sed -i "s@^PATH.*@export PATH=\$PATH:${PREFIX}/bin@g" $BUILDROOT/start_wayfire.sh
fi
chmod 755 $BUILDROOT/start_wayfire.sh
$SUDO cp $BUILDROOT/start_wayfire.sh $PREFIX/bin/startwayfire

echo "Installation done. You can put start_wayfire.sh in your PATH and use it to start Wayfire."
echo "Installation done. Run $PREFIX/bin/startwayfire to start wayfire."

ask_confirmation "Do you want to install WCM, a graphical configuration tool for Wayfire [y/n]? "
if [ $yn = Y ]; then
Expand Down