vim/linux-vm-tools
1
0
Fork 0
forked from mir/linux-vm-tools
Code Pull Requests Activity

Separate makepkg from configuration

Browse Source
This commit is contained in:
Boris Bopp 2018-03-29 12:14:52 +02:00
parent ac50616e57
commit 87201fa488
3 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/inc/config-xrdp.sh → arch/install-config.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Do not run this script directly, it gets executed by install.sh. # This script is for Arch Linux to configure XRDP for enhanced session mode
# #
# The configuration is adapted from the Ubuntu 16.04 script. # The configuration is adapted from the Ubuntu 16.04 script.
# #
@ -10,10 +11,21 @@ if [ $(id -u) -ne 0 ] ; then
exit 1 exit 1
fi fi
############################################################################### # Use Qi to check for exact package name
# XRDP if ! pacman -Qi xrdp > /dev/null ; then
# echo 'xrdp not installed. Run makepkg.sh first to install xrdp.' >&2
exit 1
fi
# Use Qs to allow xorgxrdp-devel-git
if ! pacman -Qs xorgxrdp > /dev/null ; then
echo 'xorgxrdp not installed. Run makepkg.sh first to install xorgxrdp.' >&2
exit 1
fi
###############################################################################
# Configure XRDP
#
systemctl enable xrdp systemctl enable xrdp
systemctl enable xrdp-sesman systemctl enable xrdp-sesman
@ -68,3 +80,9 @@ password include system-remote-login
session include system-remote-login session include system-remote-login
EOF EOF
###############################################################################
# .xinitrc has to be modified manually.
#
echo "You will have to configure .xinitrc to start your windows manager, see https://wiki.archlinux.org/index.php/Xinit"
echo "Reboot your machine to begin using XRDP."

32
arch/install.sh
View File

@ -1,32 +0,0 @@
#!/bin/bash
#
# This script is for Arch Linux to download and install XRDP+XORGXRDP
#
if [ $(id -u) -eq 0 ] ; then
echo 'This script must be run as a non-root user, as building packages as root is unsupported.' >&2
exit 1
fi
###############################################################################
# Prepare by installing build tools.
#
# Partial upgrades aren't supported in arch.
sudo pacman -Syu --needed --noconfirm base base-devel git
###############################################################################
# Build & Install
bash inc/build.sh
echo "Installation is complete. Beginning configuration..."
###############################################################################
# Configure
sudo bash inc/config-xrdp.sh
echo "Configuration is complete."
###############################################################################
# .xinitrc has to be modified manually.
#
echo "You will have to configure .xinitrc to start your windows manager, see https://wiki.archlinux.org/index.php/Xinit"
echo "Reboot your machine to begin using XRDP."

8
arch/inc/build.sh → arch/makepkg.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Do not run this script directly, it gets executed by install.sh. # This script is for Arch Linux to download and install XRDP+XORGXRDP
# #
if [ $(id -u) -eq 0 ] ; then if [ $(id -u) -eq 0 ] ; then
@ -8,6 +8,12 @@ if [ $(id -u) -eq 0 ] ; then
exit 1 exit 1
fi fi
###############################################################################
# Prepare by installing build tools.
#
# Partial upgrades aren't supported in arch.
sudo pacman -Syu --needed --noconfirm base base-devel git
# Create a build directory in tmpfs # Create a build directory in tmpfs
mkdir /tmp/build && cd "$_" mkdir /tmp/build && cd "$_"