aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2016-11-25 22:19:46 +0100
committerKarel Kočí <cynerd@email.cz>2016-11-25 22:19:46 +0100
commitb49df3d46b729f621faf7a459933c84b7b3085b2 (patch)
treecf629903248ee7759742bbf24570cf8bc2773f5c
parent5250654f39f4f25f62433925fb39f5472f54ebe3 (diff)
downloadmyconfigs-b49df3d46b729f621faf7a459933c84b7b3085b2.tar.gz
myconfigs-b49df3d46b729f621faf7a459933c84b7b3085b2.tar.bz2
myconfigs-b49df3d46b729f621faf7a459933c84b7b3085b2.zip
Do not install pacaur in default
-rw-r--r--utils/arch28
-rw-r--r--utils/install_pacaur23
2 files changed, 25 insertions, 26 deletions
diff --git a/utils/arch b/utils/arch
index 5293d0e..5a1ed19 100644
--- a/utils/arch
+++ b/utils/arch
@@ -1,31 +1,6 @@
# Archlinux system installation and compare
# vim: ft=sh
-# Installs pacaur
-# This expect base and base-devel to be installed
-arch_pacaur() {
- set -e
- # Make sure that we have wget
- sudo pacman -S wget
- # Download pacaur tar
- wget https://aur.archlinux.org/cgit/aur.git/snapshot/pacaur.tar.gz
- # Download cower (pacaur dependency)
- wget https://aur.archlinux.org/cgit/aur.git/snapshot/cower.tar.gz
-
- tar -xzf cower.tar.gz
- cd cower
- makepkg -cis
- cd ..
- rm -rf cower cower.tar.gz
- tar -xzf pacaur.tar.gz
- cd pacaur
- makepkg -cis
- cd ..
- rm -rf pacaur pacaur.tar.gz
-
- unset -e
-}
-
archlinux_inst() {
# Check if we are on archlinux
if ! [ -e /etc/arch-release ]; then
@@ -34,7 +9,8 @@ archlinux_inst() {
fi
# Now check for pacaur and optionally install
if ! pacaur --version 2>&1 >/dev/null; then
- arch_pacaur
+ echo Please install pacaur! >&2
+ return
fi
TFILE1=$(mktemp myconfigs-pacaur1-XXXXX)
diff --git a/utils/install_pacaur b/utils/install_pacaur
new file mode 100644
index 0000000..4c48357
--- /dev/null
+++ b/utils/install_pacaur
@@ -0,0 +1,23 @@
+# vim: ft=sh
+
+# Installs pacaur
+# This expect base and base-devel to be installed
+set -e
+
+# Make sure that we have wget
+sudo pacman -S wget
+# Download pacaur tar
+wget https://aur.archlinux.org/cgit/aur.git/snapshot/pacaur.tar.gz
+# Download cower (pacaur dependency)
+wget https://aur.archlinux.org/cgit/aur.git/snapshot/cower.tar.gz
+
+tar -xzf cower.tar.gz
+cd cower
+makepkg -cis
+cd ..
+rm -rf cower cower.tar.gz
+tar -xzf pacaur.tar.gz
+cd pacaur
+makepkg -cis
+cd ..
+rm -rf pacaur pacaur.tar.gz