Merge Archbox scripts.

README.md

@@ -25,3 +25,5 @@ You may want to add this, if you don't want to run archbox chroot without passwo
 Instead of opening terminal everytime you want to run application inside chroot, you may want to launch rofi inside chroot, install rofi and do ```archbox rofi <rofi options>```.
 #### Pulseaudio
 If the audio doesn't work, comment ```mount -R /var/lib/dbus $CHROOT/var/lib/dbus``` in init script and start pulseaudio inside chroot instead, do ```archbox pulseaudio```.
+#### Prompt
+If you use bash you could add a nice little Arch Linux icon in your prompt, add ```[[ -e /etc/arch-release ]] && export PS1=" $PS1"``` to your ```~/.bashrc```

archbox.bash

@@ -75,7 +75,7 @@ case $1 in
     ;;
     --enter)
 	    copyresolv
-        $PRIV /usr/local/share/archbox/bin/archboxenter
+        $PRIV /usr/local/share/archbox/bin/archbox --enter
 	;;
     --help)
         help_text
@@ -89,6 +89,6 @@ case $1 in
     *)
     	copyresolv
         COMMAND=$(echo $@ | tr ' ' '\ ')
-	    $PRIV /usr/local/share/archbox/bin/archboxcommand $COMMAND
+	    $PRIV /usr/local/share/archbox/bin/archbox $COMMAND
     ;;
 esac

archboxcommand.bash

@@ -1,5 +1,7 @@
 #!/bin/bash
 
 source /etc/archbox.conf
+
 COMMAND=$(echo $@ | tr ' ' '\ ')
-chroot $CHROOT /bin/su -c "$COMMAND" $USER
+[[ ! $1 = "--enter" ]] && chroot $CHROOT /bin/su -c "$COMMAND" $USER \
+    || chroot $CHROOT /bin/su $USER

archboxenter.bash

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-source /etc/archbox.conf
-chroot $CHROOT /bin/su $USER

install.sh

@@ -3,7 +3,6 @@
 mkdir -p /usr/local/share/archbox/bin
 cp -v ./archbox.bash /usr/local/bin/archbox
 cp -v ./archbox.conf /etc/archbox.conf
-cp -v ./archboxenter.bash /usr/local/share/archbox/bin/archboxenter
 cp -v ./copyresolv.bash /usr/local/share/archbox/bin/copyresolv
-cp -v ./archboxcommand.bash /usr/local/share/archbox/bin/archboxcommand
+cp -v ./archboxcommand.bash /usr/local/share/archbox/bin/archbox
 cp -v ./chroot_setup.bash /usr/local/share/archbox/chroot_setup.bash