ShadowArch fixes

This commit is contained in:
DarkFeather
2017-06-23 13:56:31 -05:00
parent 429b7e7b0c
commit 78de31f832
8 changed files with 126 additions and 29 deletions

View File

@@ -1,16 +1,19 @@
HTTPROOT = /srv/http/aninix.net
HTTPUSER = http
SYNCLIST = /etc/vimrc /etc/bash.bashrc /etc/skel /etc/tmux.conf
SYNCLIST = /etc/vimrc /etc/bash.bashrc /etc/skel /etc/tmux.conf /etc/profile
INSTALLER != curl -s https://aninix.net/foundation/installer-test.bash | /bin/bash
compile:
[ -f ./shadowarch ]
compile: ./shadowarch
@echo Nothing to compile
install: compile
cp ./vimrc /etc/vimrc
cp bash.bashrc /etc/bash.bashrc
rsync -avz -r skel/ /etc/skel
cp tmux.conf /etc/tmux.conf
cp ./profile /etc/profile
# This is a nicety.
if [ -f /root/shadowarch* ]; then sed -i 's/`uname -o`/ShadowArch/g' /etc/bash.bashrc; fi
repository: shadowarch
cp ./shadowarch ${HTTPROOT}
@@ -29,6 +32,7 @@ test:
reverse: ${HTTPROOT}/shadowarch ${SYNCLIST}
cat ${HTTPROOT}/shadowarch > ./shadowarch
for i in ${SYNCLIST}; do rsync -avz ${SYNCLIST} .; done
sed -i 's/ShadowArch/`uname -o`/' ./bash.bashrc
clean:
@echo Nothing to do.

View File

@@ -5,7 +5,7 @@
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
PS1='\[\033[00;31m\][ AniNIX::\h(\[\033[01;32m\]ShadowArch\[\033[00;31m\]) \[\033[00;36m\]\u \[\033[01;37m\]\d \t \[\033[00;35m\]\w\[\033[00;31m\] ] \n|\[\033[m\]> '
PS1='\[\033[00;31m\][ AniNIX::\h(\[\033[01;32m\]`uname -o`\[\033[00;31m\]) \[\033[00;36m\]\u \[\033[01;37m\]\d \t \[\033[00;35m\]\w\[\033[00;31m\] ] \n|\[\033[m\]> '
PS2='> '
PS3='> '
PS4='+ '
@@ -50,7 +50,7 @@ if [ "$TERM" != "screen" ] && [ -z "$DESKTOP_SESSION" ]; then
elif [ `tmux list-sessions | grep created | wc -l` -eq 1 ] && [ `tmux list-sessions | grep attached | wc -l` -eq 0 ]; then
exec tmux a -d -t `tmux list-sessions | grep created | cut -f 1 -d ':'`
fi
alias tat="tmux a -d -t"
alias tat="exec tmux a -d -t"
elif [ -x "$(which screen 2>/dev/null)" ] && [ "$TERM" != "screen" ]; then
if [ `screen -list | grep -c 'Detached'` -eq 1 ]; then
exec screen -r

32
ShadowArch/profile Normal file
View File

@@ -0,0 +1,32 @@
# /etc/profile
#Set our umask
umask 022
# Set our default path
PATH="/usr/bin/:/usr/local/sbin:/usr/local/bin:~/bin"
export PATH
IFS="
"
export IFS
# Load profiles from /etc/profile.d
if test -d /etc/profile.d/; then
for profile in /etc/profile.d/*.sh; do
test -r "$profile" && . "$profile"
done
unset profile
fi
# Source global bash config
if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
. /etc/bash.bashrc
fi
# Termcap is outdated, old, and crusty, kill it.
unset TERMCAP
# Man is much better than us at figuring this out
unset MANPATH

View File

@@ -125,7 +125,7 @@ fi
# * make for source packages
# * tor for anonymity
header Installing ArchLinux to device\(s\) on /mnt
export pkglist="base base-devel parted net-tools bind-tools git openssh make lynx irssi vim wget tor torsocks grub os-prober rsync openntpd"
export pkglist="base base-devel parted net-tools bind-tools git openssh make lynx irssi vim wget tor torsocks grub os-prober rsync openntpd tmux"
if [ "$gui" -eq 1 ]; then
export pkglist="$pkglist"" xorg-server xfce4 seamonkey conky tigervnc"
fi
@@ -159,6 +159,9 @@ arch-chroot /mnt locale-gen
ln -s /usr/share/zoneinfo/America/Chicago /mnt/etc/localtime
arch-chroot /mnt hwclock --systohc --utc
# Leave a trace of the install.
cp /root/shadowarch /mnt/root/shadowarch.installer."$(date +%F-%R)"
header Setup bootloader
if [ "$nodiskbuild" -eq 0 ]; then
export rootuuid="$(blkid "$disk""$rootpart" | cut -f 2 -d '"')"
@@ -190,8 +193,10 @@ arch-chroot /mnt systemctl enable netctl
arch-chroot /mnt netctl enable $interface
# Vim cleanup for SSH
mkdir -p /mnt/usr/share/vim/vimfiles/plugin
printf 'set mouse-=a\n' > /mnt/usr/share/vim/vimfiles/plugin/shadowarch.vim
mkdir -p /usr/share/vim/vimfiles/plugin
printf 'set mouse-=a\n' > /usr/share/vim/vimfiles/plugin/shadowarch.vim
ln -sf /etc/skel/.bashrc /mnt/root/.bashrc
# Clone ConfigPackags from AniNIX::Foundation
arch-chroot /mnt git -C /usr/local/src/ clone https://aninix.net/foundation/ConfigPackages
@@ -221,7 +226,6 @@ arch-chroot /mnt chown -R depriv:depriv /usr/local/src/
# Set SSH host keys
arch-chroot /mnt ssh-keygen -A
cp /root/shadowarch /mnt/root/shadowarch.installer."$(date +%F-%R)"
if [ "$gui" -eq 1 ]; then
echo "Remember to install your graphics drivers!

View File

@@ -4,3 +4,4 @@ bind-key -T prefix X confirm-before -p "kill-pane #P? (y/n)" kill-pane
bind-key -T prefix x new-window cryptoworkbench
bind-key -T prefix b new-window lynx https://aninix.net/
bind-key -T prefix s set status
bind-key -T prefix S setw synchronize-panes