iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6839d9f
)
refactor, make emacs build more robust
author
Ian Kelling
<ian@iankelling.org>
Fri, 28 Oct 2016 06:13:45 +0000
(23:13 -0700)
committer
Ian Kelling
<ian@iankelling.org>
Fri, 28 Oct 2016 06:13:45 +0000
(23:13 -0700)
distro-begin
patch
|
blob
|
history
diff --git
a/distro-begin
b/distro-begin
index f61b2f17f45ed0727070330a0cc8d4d026626663..b03134890ea3e4e67de6ade28ac275bbbd2771a4 100755
(executable)
--- a/
distro-begin
+++ b/
distro-begin
@@
-38,7
+38,7
@@
if [[ $EUID == 0 ]]; then
fi
fi
fi
fi
-interactive=
false # set this to true if running by hand in emacs
+interactive=
true # set this to false to force set -x
[[ $- == *i* ]] || interactive=false
if ! $interactive; then
[[ $- == *i* ]] || interactive=false
if ! $interactive; then
@@
-57,8
+57,6
@@
recompile=false
bootstrapfs=false # old flag, needs new look before using.
while [[ $1 == -* ]]; do
case $1 in
bootstrapfs=false # old flag, needs new look before using.
while [[ $1 == -* ]]; do
case $1 in
- # avoid some of the longer compilation steps,
- # when we need to rerun because we had an error
-r) recompile=true; shift ;;
esac
done
-r) recompile=true; shift ;;
esac
done
@@
-83,6
+81,9
@@
umask 0002
####### end command line parsing
PATH="/a/exe:$PATH"
####### end command line parsing
PATH="/a/exe:$PATH"
+sed="sed --follow-symlinks"
+
+##### begin setup encryption scripts ######
if encrypted; then
# I tried making a service which was dependent on reboot.target,
# but it happened too late in the shutdown process.
if encrypted; then
# I tried making a service which was dependent on reboot.target,
# but it happened too late in the shutdown process.
@@
-127,23
+128,11
@@
EOF
sudo systemctl enable keyscriptoff.service
sudo systemctl start keyscriptoff.service
fi
sudo systemctl enable keyscriptoff.service
sudo systemctl start keyscriptoff.service
fi
+##### end setup encryption scripts ######
install-myqueue
install-myqueue
-if iank-dev; then
- desktop=DESKTOP_DOMAIN # TODO, broken. rethink this next time it's used
- if $bootstrapfs; then
- # TODO: broken. need to copy files in this directory too, probably rethink this.
- cp="scp $desktop:"
- # for moving to a new hd, change $cp to move between filesystems
- mkdir -p /a/bin
- chown -R ian:ian /a # probably needs to be removed
- $cp/a/c /a
- echo -e \\n\\n\\n | ssh-keygen -t rsa
- fi
-fi
-
# this script has been designed to be idempotent
# todo, it would be nice to cut down on some of the output
# this script has been designed to be idempotent
# todo, it would be nice to cut down on some of the output
@@
-158,17
+147,15
@@
$interactive || errcatch
set +x
source /a/bin/distro-functions/src/identify-distros
$interactive || set -x
set +x
source /a/bin/distro-functions/src/identify-distros
$interactive || set -x
-echo path:$PATH
-
if isfedora; then
# comment out line disallowing calling sudo in scripts
if isfedora; then
# comment out line disallowing calling sudo in scripts
- sudo
sed -i --follow-symlinks
's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers
+ sudo
$sed -i
's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers
# turn on magic sysrq commands for this boot cycle
echo 1 > sudo dd of=/proc/sys/kernel/sysrq
# selinux is not user friendly. Like, you enable samba, but you haven't run the magic selinux commands so it doesn't work
# and you have no idea why.
# turn on magic sysrq commands for this boot cycle
echo 1 > sudo dd of=/proc/sys/kernel/sysrq
# selinux is not user friendly. Like, you enable samba, but you haven't run the magic selinux commands so it doesn't work
# and you have no idea why.
- sudo
sed -i --follow-symlinks
's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config
+ sudo
$sed -i
's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config
selinuxenabled && sudo setenforce 0
fi
selinuxenabled && sudo setenforce 0
fi
@@
-186,7
+173,7
@@
case $distro in
esac
if linode; then
esac
if linode; then
- sudo sed -i '/^127\.0\.1\.1/d' /etc/hosts
+ sudo
$
sed -i '/^127\.0\.1\.1/d' /etc/hosts
echo "127.0.1.1 $HOSTNAME.lan $HOSTNAME" | sudo tee -a /etc/hosts
fi
echo "127.0.1.1 $HOSTNAME.lan $HOSTNAME" | sudo tee -a /etc/hosts
fi
@@
-197,36
+184,24
@@
if [[ $EUID == 0 ]]; then
fi
fi
-# link files
-
-lnf-home() {
- # $2 and opts are unused so far.
- opts=()
- while [[ $1 == -* ]]; do
- opts+=($1)
- shift
- done
- lnf ${opts[@]} "$1" /home/ian/$2
+#### begin link bashrc repo for all users ######
+for x in /a/c/repos/bash/!(.git|..|.); do
+ lnf "$x" /home/ian
sudo -u traci -i <<EOF
PATH="/a/exe:$PATH"
sudo -u traci -i <<EOF
PATH="/a/exe:$PATH"
-lnf
${opts[@]} "$1" /home/traci/$2
+lnf
"$x" /home/traci
EOF
EOF
-}
-
-for x in /a/c/repos/bash/!(.git|..|.); do
- lnf-home "$x"
sudo -i <<EOF
PATH="/a/exe:$PATH"
lnf $x /root
EOF
done
sudo -i <<EOF
PATH="/a/exe:$PATH"
lnf $x /root
EOF
done
+#### end link bashrc repo for all users ######
-echo path:$PATH
set +x
errallow
source ~/.bashrc
set +x
errallow
source ~/.bashrc
-echo path:$PATH
$interactive || errcatch
$interactive || set -x
$interactive || errcatch
$interactive || set -x
@@
-242,6
+217,9
@@
EOF
isfedora && tu /etc/sysctl.conf 'kernel.sysrq = 1'
isfedora && tu /etc/sysctl.conf 'kernel.sysrq = 1'
+s lnf -T /q/p /p
+# this needs to be before installing pacserve so we have gpg conf.
+conflink
if isdebian; then
codename=$(debian-codename)
if isdebian; then
codename=$(debian-codename)
@@
-263,10
+241,6
@@
EOF
fi
fi
fi
fi
-s lnf -T /q/p /p
-# this needs to be before installing pacserve so we have gpg conf.
-conflink
-
if isarch; then
#https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages
sudo pacman -S --noconfirm --needed base-devel jq
if isarch; then
#https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages
sudo pacman -S --noconfirm --needed base-devel jq
@@
-553,7
+527,7
@@
if has_x; then
fi
pi cryptsetup lvm2
# enables trim for volume delete, other rare commands.
fi
pi cryptsetup lvm2
# enables trim for volume delete, other rare commands.
-sudo sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf
+sudo
$
sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf
if encrypted; then
if isdeb; then
if encrypted; then
if isdeb; then
@@
-729,12
+703,10
@@
if has_x; then
fi
pi hunspell hunspell-en
else
fi
pi hunspell hunspell-en
else
- # to disable emacs git build,
- # s apt-get install emacs
if $recompile; then
if $recompile; then
- /a/bin/buildscripts/emacs
-u
+ /a/bin/buildscripts/emacs
else
else
- /a/bin/buildscripts/emacs -
r
+ /a/bin/buildscripts/emacs -
-no-r || /a/bin/buildscripts/emacs
fi
fi
fi
fi
@@
-778,7
+750,7
@@
EOF
# https://wiki.archlinux.org/index.php/Xinitrc
for homedir in /home/*; do
cp /etc/X11/xinit/xinitrc $homedir/.xinitrc
# https://wiki.archlinux.org/index.php/Xinitrc
for homedir in /home/*; do
cp /etc/X11/xinit/xinitrc $homedir/.xinitrc
- sed -ri '/^ *twm\b/,$d' $homedir/.xinitrc
+
$
sed -ri '/^ *twm\b/,$d' $homedir/.xinitrc
tee -a $homedir/.xinitrc <<'EOF'
/a/bin/desktop-20-autostart.sh
xsetroot -cursor_name left_ptr
tee -a $homedir/.xinitrc <<'EOF'
/a/bin/desktop-20-autostart.sh
xsetroot -cursor_name left_ptr