Some changes
This commit is contained in:
parent
33ec47c6e3
commit
b7a8e12c6b
@ -44,7 +44,7 @@ PREFIX="${PREFIX:-/usr/local}"
|
||||
mkdir -p $PREFIX/share/archbox/bin
|
||||
mkdir -p $ETC_DIR
|
||||
install -v -D -m 755 ./src/archbox $PREFIX/bin/archbox
|
||||
install -v -D -m 755 ./src/archbox-desktop.bash $PREFIX/bin/archbox-desktop
|
||||
install -v -D -m 755 ./src/archbox-desktop $PREFIX/bin/archbox-desktop
|
||||
[[ ! -e /etc/archbox.conf || ! -z $FORCE_INSTALL_CONFIG ]] && genconfig > $ETC_DIR/archbox.conf
|
||||
install -v -D -m 755 ./src/exec.bash $PREFIX/share/archbox/bin/exec
|
||||
install -v -D -m 755 ./src/enter.bash $PREFIX/share/archbox/bin/enter
|
||||
|
@ -93,7 +93,7 @@ case $1 in
|
||||
"${PREFIX}"/share/archbox/bin/init start
|
||||
cp "${PREFIX}"/share/archbox/chroot_setup.bash "${CHROOT}"/chroot_setup
|
||||
printf "%s" $ARCHBOX_USER > /tmp/archbox_user
|
||||
chroot $CHROOT /bin/bash -c "/chroot_setup"
|
||||
chroot $CHROOT /bin/bash /chroot_setup
|
||||
exit $?
|
||||
;;
|
||||
-e|--enter)
|
||||
|
@ -1,15 +1,26 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/bin/sh
|
||||
|
||||
. /etc/archbox.conf >/dev/null 2>&1
|
||||
|
||||
set --
|
||||
|
||||
# Text colors/formatting
|
||||
red="\033[38;5;1"
|
||||
green="\033[38;5;2"
|
||||
bold="\033[1m"
|
||||
reset="\033[m"
|
||||
|
||||
err(){
|
||||
echo "$(tput bold)$(tput setaf 1)==> $@ $(tput sgr0)" 1>&2
|
||||
printf "${red}${bold}%s${reset}\n" "==> $*" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
msg(){
|
||||
echo "$(tput bold)$(tput setaf 2)==> $@ $(tput sgr0)"
|
||||
printf "${green}${bold}%s${reset}\n" "==> $*" 1>&2
|
||||
}
|
||||
|
||||
PATH=/usr/bin
|
||||
|
||||
msg "Initializing pacman keyrings..."
|
||||
pacman-key --init
|
||||
pacman-key --populate archlinux
|
||||
|
Loading…
Reference in New Issue
Block a user