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:
aa5f34e
)
minor doc update
author
Ian Kelling
<ian@iankelling.org>
Mon, 15 Aug 2016 01:47:55 +0000
(18:47 -0700)
committer
Ian Kelling
<ian@iankelling.org>
Tue, 16 Aug 2016 08:17:56 +0000
(
01:17
-0700)
README
patch
|
blob
|
history
distro-begin
patch
|
blob
|
history
diff --git
a/README
b/README
index 141f3094792cbc8b2d086928ba1f6e879f6d019f..0fd249f31f11730cd3da34336823daebd90ad6f1 100644
(file)
--- a/
README
+++ b/
README
@@
-1,3
+1,5
@@
-Scripts I use to setup my distro. It's not meant for other people to run
-verbatum, but for them to read and copy the good parts. It has
-dependencies on other repos at https://iankelling.org/git.
+Scripts to setup distros how I like
+
+It's not meant for other people to run verbatum, but for them to read
+and copy the good parts. It has dependencies on other repos at
+https://iankelling.org/git.
diff --git
a/distro-begin
b/distro-begin
index 5ffb0d288e3b4cf2fb161deaf19de67dc82bdc4e..a37a19b86006691e1229cd630bdd625795181042 100755
(executable)
--- a/
distro-begin
+++ b/
distro-begin
@@
-72,11
+72,11
@@
if [[ $1 ]]; then
export HOSTNAME=$1
fi
export HOSTNAME=$1
fi
-for f in iank-dev htpc treetowl x2 frodo tp li lj; do
+for f in iank-dev htpc treetowl x2 frodo tp li lj
demohost
; do
eval "$f() { [[ $HOSTNAME == $f ]]; }"
done
has_p() { iank-dev || x2 || frodo || tp; }
eval "$f() { [[ $HOSTNAME == $f ]]; }"
done
has_p() { iank-dev || x2 || frodo || tp; }
-has_x() { ! { lj || li; }; }
+has_x() { ! { lj || li
|| demohost
; }; }
encrypted() { has_p; }
shopt -s extglob
encrypted() { has_p; }
shopt -s extglob
@@
-263,6
+263,10
@@
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
@@
-282,7
+286,8
@@
if isarch; then
aurpi cower pacaur
pi pacserve
aurpi cower pacaur
pi pacserve
- x=$(mktemp); /a/opt/pacman.conf-insert_pacserve >$x
+
+ x=$(mktemp); /usr/bin/pacman.conf-insert_pacserve >$x
sudo dd of=/etc/pacman.conf if=$x; rm $x
sudo systemctl enable pacserve.service
sudo systemctl start pacserve.service
sudo dd of=/etc/pacman.conf if=$x; rm $x
sudo systemctl enable pacserve.service
sudo systemctl start pacserve.service
@@
-306,14
+311,8
@@
pi trash-cli
#s hostname -F /etc/hostname
#HOSTNAME=$(hostname)
#s hostname -F /etc/hostname
#HOSTNAME=$(hostname)
-#########################################
-# NOTE: only /a needs to be mounted for creating links!
-###########################################
-# todo: reconcile ~/.ssh/config work/home
-s lnf -T /q/p /p
s lnf -T /a/bin /b
s lnf -T /a/bin /b
-conflink
if has_p; then
lnf -T /p/offlineimap ~/Maildir
if has_p; then
lnf -T /p/offlineimap ~/Maildir