lemniskett/archbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lemniskett:master
Branches Tags
lemniskett:master
lemniskett:POSIX-rewrite
..
compare: lemniskett:POSIX-rewrite
Branches Tags
lemniskett:master
lemniskett:POSIX-rewrite

No commits in common. "master" and "POSIX-rewrite" have entirely different histories.
master ... POSIX-rewr

7 changed files with 69 additions and 168 deletions
Show Stats Expand all files Collapse all files

2
CROS_INSTALL.md
View File

@ -25,7 +25,7 @@ Add `archbox -m` to `~/.bashrc` in host.
Install [`cros-adapta-gtk-theme`](https://aur.archlinux.org/packages/cros-adapta-gtk-theme/), `ttf-roboto`, and `papirus-icon-theme` and use it with :
```sh
gsettings set org.gnome.desktop.interface gtk-theme "cros-adapta"
gsettings set org.gnome.desktop.interface icon-theme "Papirus-Light"
gsettings set org.gnome.desktop.interface icon-theme "Papirus"
gsettings set org.gnome.desktop.interface font-name "Roboto 10"
```

6
README.md
View File

@ -99,7 +99,7 @@ SERVICES="php-fpm:3 nginx"
This will add 3 seconds delay after executing php-fpm.
##### Start services immediately
To start services immediately, in Archbox, do :
```8
```
sudo archboxctl exec <Service name>
```
@ -133,11 +133,11 @@ ENV_VAR="QT_QPA_PLATFORMTHEME=qt5ct GTK_CSD=0 LD_PRELOAD=/var/home/lemniskett/gi
#### Adding more shared directories
Edit SHARED_FOLDER in ```/etc/archbox.conf```. For example:
```
SHARED_FOLDER="/home /var/www"
SHARED_FOLDER=( /home /var/www )
```
To mount to different directory, use ```:``` separator :
```
SHARED_FOLDER="/home /var/www:/host_webroot"
SHARED_FOLDER=( /home /var/www:/host_webroot )
```
### Known issues
#### NixOS-specific issues

2
install.sh
View File

@ -34,7 +34,7 @@ ENV_VAR="${ENV_VAR:-}"
SERVICES="${SERVICES:-}"
# Share other host directories into Archbox, absolute path needed.
SHARED_FOLDER="${SHARED_FOLDER:-/home}"
SHARED_FOLDER="${SHARED_FOLDERS:-/home}"
EOF
}

8
src/archbox
View File

@ -3,10 +3,10 @@
. /etc/archbox.conf
# Text colors/formatting
red='\033[1;31m'
green='\033[1;32m'
bold='\033[1m'
reset='\033[m'
red="\033[38;5;1"
green="\033[38;5;2"
bold="\033[1m"
reset="\033[m"
err(){
printf "${red}${bold}%s${reset}\n" "==> $*" 1>&2

178
src/archbox-desktop
View File

@ -2,108 +2,11 @@
. /etc/archbox.conf >/dev/null 2>&1
multiselect() {
echo "\nSelect with <space>, confirm with <enter>"
# little helpers for terminal print control and key input
ESC=$( printf "\033")
cursor_blink_on() { printf "$ESC[?25h"; }
cursor_blink_off() { printf "$ESC[?25l"; }
cursor_to() { printf "$ESC[$1;${2:-1}H"; }
print_inactive() { printf "$2 $1 "; }
print_active() { printf "$2 $ESC[7m $1 $ESC[27m"; }
get_cursor_row() { IFS=';' read -sdR -p $'\E[6n' ROW COL; echo ${ROW#*[}; }
key_input() {
local key
IFS= read -rsn1 key 2>/dev/null >&2
if [[ $key = "" ]]; then echo enter; fi;
if [[ $key = $'\x20' ]]; then echo space; fi;
if [[ $key = $'\x1b' ]]; then
read -rsn2 key
if [[ $key = [A ]]; then echo up; fi;
if [[ $key = [B ]]; then echo down; fi;
fi
}
toggle_option() {
local arr_name=$1
eval "local arr=(\"\${${arr_name}[@]}\")"
local option=$2
if [[ ${arr[option]} == true ]]; then
arr[option]=
else
arr[option]=true
fi
eval $arr_name='("${arr[@]}")'
}
local retval=$1
local options
local defaults
IFS=';' read -r -a options <<< "$2"
if [[ -z $3 ]]; then
defaults=()
else
IFS=';' read -r -a defaults <<< "$3"
fi
local selected=()
for ((i=0; i<${#options[@]}; i++)); do
selected+=("${defaults[i]}")
printf "\n"
done
# determine current screen position for overwriting the options
local lastrow=`get_cursor_row`
local startrow=$(($lastrow - ${#options[@]}))
# ensure cursor and input echoing back on upon a ctrl+c during read -s
trap "cursor_blink_on; stty echo; printf '\n'; exit" 2
cursor_blink_off
local active=0
while true; do
# print options by overwriting the last lines
local idx=0
for option in "${options[@]}"; do
local prefix="[ ]"
if [[ ${selected[idx]} == true ]]; then
prefix="[x]"
fi
cursor_to $(($startrow + $idx))
if [ $idx -eq $active ]; then
print_active "$option" "$prefix"
else
print_inactive "$option" "$prefix"
fi
((idx++))
done
# user key control
case `key_input` in
space) toggle_option selected $active;;
enter) break;;
up) ((active--));
if [ $active -lt 0 ]; then active=$((${#options[@]} - 1)); fi;;
down) ((active++));
if [ $active -ge ${#options[@]} ]; then active=0; fi;;
esac
done
# cursor position back to normal
cursor_to $lastrow
printf "\n"
cursor_blink_on
eval $retval='("${selected[@]}")'
}
# Text colors/formatting
red='\033[1;31m'
green='\033[1;32m'
bold='\033[1m'
reset='\033[m'
red="\033[38;5;1"
green="\033[38;5;2"
bold="\033[1m"
reset="\033[m"
err(){
printf "${red}${bold}%s${reset}\n" "==> $*" 1>&2
@ -116,12 +19,13 @@ msg(){
install_desktop(){
mkdir -p ~/.local/share/applications/archbox
i="$(echo $1 | sed 's|.*/||')"
for i in $@; do
archbox readlink /usr/share/applications/$i >/dev/null 2>&1 \
&& cp "${CHROOT}"/$(archbox readlink /usr/share/applications/$i) $HOME/.local/share/applications/archbox/$i \
|| cp "${CHROOT}"/usr/share/applications/$i "$HOME/.local/share/applications/archbox/$i"
&& cp "${CHROOT}"/$(archbox readlink /usr/share/applications/$i) ~/.local/share/applications/archbox \
|| cp "${CHROOT}"/usr/share/applications/$i "~/.local/share/applications/archbox"
sed -i 's/Exec=/Exec=archbox\ /g' ~/.local/share/applications/archbox/$i
sed -i '/TryExec=/d' ~/.local/share/applications/archbox/$i
done
}
checkdep(){
@ -131,13 +35,14 @@ checkdep(){
help_text(){
printf "%s" "
USAGE: $0 <arguments>
OPTIONS:
<no option> Choice to install or uninstall desktop entries
-i, --install FILE Installs desktop entries in /usr/share/applications
-r, --remove FILE Removes desktop entries in ~/.local/share/applications/archbox
-l, --list List available desktop entries
-s, --list-installed List installed desktop entries
-h, --help Displays this help message
"
}
@ -175,41 +80,44 @@ case $1 in
list ~/.local/share/applications/archbox
;;
*)
checkdep zenity
checkdep sed
checkdep tr
checkdep update-desktop-databse
printf "What do you want to do?\nPress I to install desktop entries.\nPress R to remove desktop entries. (I/r)"
read -rn 1
case $REPLY in
[rR])
LIST="$(list "${HOME}"/.local/share/applications/archbox)"
printf "$LIST" >/tmp/archboxlist
LIST2="$(cat /tmp/archboxlist | sed -z 's/\n/;/g;s/,$/\n/')"
multiselect RESULT "${LIST2}"
for i in "${!RESULT[@]}"; do
if [ "${RESULT[$i]}" == "true" ]; then
rm ${HOME}/.local/share/applications/archbox/"$(sed "$((i+1))q;d" /tmp/archboxlist | sed 's|.*/||')"
fi
checkdep update-desktop-database
action="$(zenity --list --radiolist --title 'Archbox Desktop Manager' \
--height=200 --width=450 --column 'Select' --column 'Action' \
--text 'What do you want to do?' \
FALSE 'Install desktop entries' FALSE 'Remove desktop entries')"
case $action in
'Install desktop entries')
zenity_entry="$(list "${CHROOT}"/usr/share/applications | sed 's/\ /\ FALSE\ /g')"
selected_entry=$(zenity --list --checklist --height=500 --width=450 \
--title="Archbox Desktop Manager" \
--text "Select .desktop entries those you want to install" \
--column "Select" --column "Applications" \
FALSE $zenity_entry | sed 's/|/\ /g')
[ $selected_entry ] || exit 1
install_desktop $selected_entry
update-desktop-database
exit 0
;;
'Remove desktop entries')
list_desktop="$(list ~/.local/share/applications/archbox)"
[ $list_desktop = "*" ] && zenity --info --title "Archbox Desktop Manager" \
--text "No .desktop files installed" --width=300 && exit 1
zenity_entry="$(printf "%s" "$list_desktop" | sed 's/\ /\ FALSE\ /g')"
selected_entry=$(zenity --list --checklist --height=500 --width=450 \
--title="Archbox Desktop Manager" \
--text "Select .desktop entries those you want to remove" \
--column "Select" --column "Applications" \
FALSE $zenity_entry | sed 's/|/\ /g')
[[ -z $selected_entry ]] && exit 1
for i in $selected_entry; do
rm ~/.local/share/applications/archbox/$i
done
update-desktop-database
rm /tmp/archboxlist
exit $?
;;
*)
LIST="$(list "${CHROOT}"/usr/share/applications)"
printf "$LIST" >/tmp/archboxlist
LIST2="$(cat /tmp/archboxlist | sed -z 's/\n/;/g;s/,$/\n/')"
multiselect RESULT "${LIST2}"
for i in "${!RESULT[@]}"; do
if [ "${RESULT[$i]}" == "true" ]; then
install_desktop "$(sed "$((i+1))q;d" /tmp/archboxlist)"
fi
done
update-desktop-database
rm /tmp/archboxlist
exit 0
;;
esac
exit 1
;;
esac

11
src/chroot_setup
View File

@ -1,8 +1,8 @@
# Text colors/formatting
red='\033[1;31m'
green='\033[1;32m'
bold='\033[1m'
reset='\033[m'
red="\033[38;5;1"
green="\033[38;5;2"
bold="\033[1m"
reset="\033[m"
err(){
printf "${red}${bold}%s${reset}\n" "==> $*" 1>&2
@ -54,6 +54,5 @@ printf "%s\n" "Enter $CHROOT_USER password"
while true; do
passwd $CHROOT_USER && break
done
sed -i 's/# %wheel ALL=(ALL:ALL) NOPASSWD: ALL/%wheel ALL=(ALL:ALL) NOPASSWD: ALL/g' sudoers
sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers
printf "%s\n" "Don't forget to run \"archbox --mount\" in host on boot"

28
src/init
View File

@ -3,10 +3,10 @@
. /etc/archbox.conf
# Text colors/formatting
red='\033[1;31m'
green='\033[1;32m'
bold='\033[1m'
reset='\033[m'
red="\033[38;5;1"
green="\033[38;5;2"
bold="\033[1m"
reset="\033[m"
err(){
printf "${red}${bold}%s${reset}\n" "==> $*" 1>&2
@ -17,16 +17,11 @@ msg(){
printf "${green}${bold}%s${reset}\n" "==> $*" 1>&2
}
checkmount(){
mount | grep "${CHROOT}${1}" >/dev/null 2>&1
}
rbind(){
if checkmount $1; then
if [ "$(mount | grep "${CHROOT}"${1} >/dev/null 2>&1)" ]; then
msg "${CHROOT}${1} already mounted."
else
mkdir -p "${CHROOT}${1}"
mount -R $1 "${CHROOT}${1}"
mount -R $1 "${CHROOT}"${1}
msg "${CHROOT}${1} mounted!"
fi
if [ "$2" = "make-rslave" ]; then
@ -35,17 +30,16 @@ rbind(){
}
rbind_diff() {
if checkmount $2; then
msg "${CHROOT}${2} already mounted."
if [ "$(mount | grep "${CHROOT}"${2})" ]; then
msg "$CHROOT$2 already mounted."
else
mkdir -p "${CHROOT}${1}"
mount -R $1 "${CHROOT}${2}"
mount -R $1 "${CHROOT}"${2}
msg "${CHROOT}${2} mounted!"
fi
}
bindproc() {
if checkmount /proc; then
if [ "$(mount | grep "${CHROOT}"/proc)" ]; then
msg "${CHROOT}/proc already mounted."
else
mount -t proc /proc "${CHROOT}"/proc
@ -56,7 +50,7 @@ bindproc() {
rmbind() {
umount_args=-R
[ "$LAZY_UMOUNT" = "yes" ] && umount_args=-Rl
if checkmount $1; then
if [ "$(mount | grep "${CHROOT}"${1})" ]; then
umount $umount_args "${CHROOT}"${1}
msg "${CHROOT}${1} unmounted!"
fi