#!/bin/bash -l
# Copyright (C) 2016 Ian Kelling
-# This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# todo. dunno why, but original bootstrap of timezone is not sticking.
# fixed manually with:
# for bootstrapping a new machine
# to make ssh run better, first run this:
-sudo bash -c 'source /a/c/repos/bash/.bashrc && source /a/bin/ssh-emacs-setup'
+sudo bash -c 'source /a/c/repos/bash/.bashrc && source /a/exe/ssh-emacs-setup'
# see t.org for OS installer notes
export HOSTNAME=$1
fi
-for f in iank-dev htpc treetowl x2 frodo tp lj lk; do
+for f in iank-dev htpc treetowl x2 frodo tp li lj; do
eval "$f() { [[ $HOSTNAME == $f ]]; }"
done
-has_p() { iank-dev || x2 || frodo; }
-has_x() { ! lj && ! lk; }
-encrypted() { has_p || tp; }
+has_p() { iank-dev || x2 || frodo || tp; }
+has_x() { ! { lj || li; }; }
+encrypted() { has_p; }
shopt -s extglob
export GLOBIGNORE=*/.:*/..
####### end command line parsing
+PATH="/a/exe:$PATH"
if encrypted; then
# I tried making a service which was dependent on reboot.target,
# but it happened too late in the shutdown process.
# service that happens late in the game.
After=postfix.service
DefaultDependencies=no
+# not sure if needed, makes sure we shut down before reboot.target
Conflicts=reboot.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/true
-ExecStop=/a/bin/keyscript-on
+ExecStop=/a/exe/keyscript-on
[Install]
WantedBy=keyscriptoff.service
[Service]
Type=oneshot
-ExecStart=/a/bin/keyscript-off
+ExecStart=/a/exe/keyscript-off
[Install]
WantedBy=multi-user.target
fi
-/a/bin/install-myqueue
+install-myqueue
if iank-dev; then
desktop=$(ssh root@iankelling.org grep desktop /etc/hosts | grep -o "^.* ")
# todo, it would be nice to cut down on some of the output
-for x in /a/bin/bash-programs-by-ian/repos/{errhandle,tee-unique,lnf}/*-function; do
- # output is below so shellcheck can verify sources
- echo "# shellcheck source=$x";
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/errhandle/bash-trace-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/errhandle/errallow-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/errhandle/errcatch-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/errhandle/errexit-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/tee-unique/teeu-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/lnf/lnf-function
+for x in /a/bin/errhandle/*-function; do
source $x
done
if isfedora; then
# comment out line disallowing calling sudo in scripts
- sudo sed -i 's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers
+ sudo sed -i --follow-symlinks '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.
- sudo sed -i 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config
+ sudo sed -i --follow-symlinks 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config
selinuxenabled && sudo setenforce 0
fi
sudo bash -c ". /a/bin/fai/fai-wrapper && /a/bin/fai/fai/config/scripts/GRUB_PC/11-ian"
;;
*)
- sudo bash -c ". /a/bin/fai-wrapper &&
+ sudo bash -c ". /a/bin/fai/fai-wrapper &&
/a/bin/fai/fai/config/distro-install-common/end"
;;
esac
done
lnf ${opts[@]} "$1" /home/ian/$2
sudo -u traci -i <<EOF
-source /a/bin/bash-programs-by-ian/repos/lnf/lnf-function
+PATH="/a/exe:$PATH"
lnf ${opts[@]} "$1" /home/traci/$2
EOF
}
for x in /a/c/repos/bash/!(.git); do
lnf-home "$x"
sudo -i <<EOF
-source /a/bin/bash-programs-by-ian/repos/lnf/lnf-function
+PATH="/a/exe:$PATH"
lnf $x /root
EOF
done
if isdebian; then
codename=$(debian-codename)
- # non-existent var, as Im not planning to use stable right now
- if isdebian-stable; then
- if has_x; then
- s dd of=/etc/apt/sources.list.d/mozilla-iceweasel.list <<EOF
+ if isdebian-stable && has_x; then
+ s dd of=/etc/apt/sources.list.d/mozilla-iceweasel.list <<EOF
deb http://mozilla.debian.net/ $codename-backports firefox-release
deb-src http://mozilla.debian.net/ $codename-backports firefox-release
EOF
- fi
-
- # we change the mirror from the default, so we cant use tu
- s dd of=/etc/apt/sources.list.d/main-backports.list <<EOF
-deb http://http.debian.net/debian $codename-backports main contrib non-free
-deb-src http://http.debian.net/debian $codename-backports main contrib non-free
-EOF
-
p update
# take care of mozilla signing errors in previous command
pi pkg-mozilla-archive-keyring
}
aurpi cower pacaur
- # for aur, automatically dl & add gpg keys.
- # Just the keyserver-options line goes in dirmngr.conf once
- # this bug is fixed: https://bugs.gnupg.org/gnupg/issue2147
- for homedir in /home/*; do
- # this creates ~/.gnupg. addgnupghome is kinda broken on arch.
- HOME=$homedir gpg -k
- teeu $homedir/.gnupg/gpg.conf <<EOF
-$(grep -o '^ *keyserver .*' $homedir/.gnupg/dirmngr.conf)
-keyserver-options auto-key-retrieve
-EOF
- done
pi pacserve
x=$(mktemp); /a/opt/pacman.conf-insert_pacserve >$x
sudo dd of=/etc/pacman.conf if=$x; rm $x
# todo: reconcile ~/.ssh/config work/home
s lnf -T /q/p /p
s lnf -T /a/bin /b
-/a/bin/conflink
+conflink
if has_p; then
lnf -T /p/offlineimap ~/Maildir
lnf -T /p/News ~/News
# don't use /* because I don't want to require it to be mounted
- s lnf /q/root/.editor-backups /q/root/.undo-tree-history \
- /a/opt /a/c/.emacs.d /root
fi
-/a/bin/rootsshsync
+s lnf /q/root/.editor-backups /q/root/.undo-tree-history \
+ /a/opt /a/c/.emacs.d $HOME/mw_vars /k/backup /root
+
+rootsshsync
s lnf /a/c/.inputrc /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root
if isdebian-stable; then
pi firefox/$codename-backports
else
- pi firefox/unstable # has no unstable dependencies
+ # for a while, firefox/unstable had all it\'s deps satisfied
+ # by testing packages, but now i hit a conflict,
+ # it wanted a newer libfontconfig1, but emacs build-deps
+ # wanted an older one. Oh well, they seem to release
+ # a new esr version every 9 months or so.
+ pi firefox-esr
fi
fi
# for hosts which require nonfree drivers
- case $HOSTNAME in
- tp|x2) : ;;
- *) pi linux-image-amd64 firmware-linux-nonfree \
- firmware-linux-free linux-headers-amd64
- ;;
- esac
+ # i previously had extra packages listed here linux-image-amd64
+ # firmware-linux-free linux-headers-amd64, but I
+ # don\'t see any reason why. seems to work in testing without.
+ # remove this note if it continues to work.
+ p=firmware-linux-nonfree
+ if apt-cache show $p &>/dev/null; then
+ pi $p
+ fi
;;&
ubuntu|debian)
if has_x; then
;;&
ubuntu|debian|fedora)
if has_x; then
- pi xkbset
- fi
- ;;&
+ if isdebian-stable; then
+ pi xkbset
+ else
+ # xkbset was in testing for quite a while, dunno
+ # why it's not anymore. Sometime I should check and
+ # see if it's back in testing, but the unstable package
+ # doesn't upgrade anything form testing, and it's tiny
+ # so I'm not bothering to automate it.
+ pi xkbset/unstable
+fi
+fi
+;;&
esac
if has_x; then
# work desktop doesnt need gpg stuff, but it doesnt hurt
s dd of=/etc/profile.d/environment.sh <<'EOF'
-# IAN: EDIT THIS FROM /a/bin/distro-begin
+# IAN: EDIT THIS FROM /a/bin/distro-setup/distro-begin
if [ -f $HOME/path_add-function ]; then
. $HOME/path_add-function
-/a/bin/postfix-setup
+postfix-setup
if isubuntu; then
# disable crash report annoying crap
iankelling.org / git / distro-setup / blobdiff