diff --git a/README.md b/README.md
index 25f42f4fc..014539245 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,48 @@
-# Cnchi
+= Cnchi =
-Graphical Installer for Antergos Linux (FKA Cinnarch Linux)
+**Graphical Installer for Antergos Linux (FKA Cinnarch Linux)**
-Usage: sudo -E cnchi.py
+Usage:
+```lang=sh
+sudo -E cnchi.py```
-To create logs to help debug problems: sudo -E cnchi.py -dv
+To create logs to help debug problems:
+```lang=sh
+sudo -E cnchi.py -dv```
-## Translations
+==Translations
We manage our translations in transifex:
-* https://www.transifex.com/projects/p/antergos/
-
-## Dependencies
-
- * gtk3
- * python3
- * python-cairo
- * python-dbus
- * python-gobject
- * python-mako
- * pyparted (parted, dosfstools, mtools, ntfs-3g, ntfsprogs)
- * pyalpm (pacman)
- * libtimezonemap
- * webkitgtk
- * hdparm
- * hwinfo
- * upower
+ - https://www.transifex.com/projects/p/antergos/
+
+==Dependencies
+
+ - gtk3
+ - python3
+ - python-cairo
+ - python-dbus
+ - python-gobject
+ - python-mako
+ - pyparted (parted, dosfstools, mtools, ntfs-3g, ntfsprogs)
+ - pyalpm (pacman)
+ - libtimezonemap
+ - webkitgtk
+ - hdparm
+ - hwinfo
+ - upower
-#### Unit tests
+==Unit tests
- * python-mock
+ - python-mock
-#### Fonts needed by the keyboard widget
+==Fonts needed by the keyboard widget
- * ttf-aboriginal-sans
- * ttf-indic-otf
- * ttf-khmer
- * ttf-lohit-fonts
- * ttf-myanmar3
- * ttf-thaana-fonts
- * ttf-tlwg
+ - ttf-aboriginal-sans
+ - ttf-indic-otf
+ - ttf-khmer
+ - ttf-lohit-fonts
+ - ttf-myanmar3
+ - ttf-thaana-fonts
+ - ttf-tlwg
diff --git a/data/packages.xml b/data/packages.xml
index c68e6f254..47ada8b59 100644
--- a/data/packages.xml
+++ b/data/packages.xml
@@ -145,6 +145,7 @@
file-roller
gedit
gnome-calculator
+ gnome-common
gnome-disk-utility
gnome-keyring
gnome-screenshot
diff --git a/scripts/fonts.conf b/scripts/fonts.conf
new file mode 100644
index 000000000..0768c615d
--- /dev/null
+++ b/scripts/fonts.conf
@@ -0,0 +1,34 @@
+
+
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+ hintslight
+
+
+
+
+ rgb
+
+
+
+
+ true
+
+
+
+
+ lcddefault
+
+
+
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index 3dfae42f5..4244b193d 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -386,6 +386,14 @@ postinstall(){
if [[ $DESKTOP != 'nox' ]];then
set_synaptics
fi
+
+ # Configure fontconfig
+ FONTCONFIG_FILE="/usr/share/cnchi/scripts/fonts.conf"
+ FONTCONFIG_DIR="${DESTDIR}/home/${USER_NAME}/.config/fontconfig"
+ if [ -f ${FONTCONFIG_FILE} ]; then
+ mkdir -p ${FONTCONFIG_DIR}
+ cp ${FONTCONFIG_FILE} ${FONTCONFIG_DIR}
+ fi
# Set Antergos name in filesystem files
cp /etc/arch-release ${DESTDIR}/etc
diff --git a/scripts/set-settings b/scripts/set-settings
index d58265068..1fa59f81a 100755
--- a/scripts/set-settings
+++ b/scripts/set-settings
@@ -28,6 +28,9 @@ if [[ ${DESKTOP} == 'gnome' ]];then
# Enable lockscreen extension
dbus-launch gsettings set org.gnome.shell enabled-extensions "['lockscreen@dev.antergos.com']"
+ # Disable Terminal Bell
+ dbus-launch gsettings set org.gnome.desktop.wm.preferences audible-bell false
+
fi
if [[ ${DESKTOP} == 'cinnamon' ]];then
@@ -70,6 +73,10 @@ if [[ ${DESKTOP} == 'cinnamon' ]];then
# Set icon theme
dbus-launch gsettings set org.cinnamon.desktop.interface icon-theme "Faenza-Dark"
dbus-launch gsettings set org.gnome.desktop.interface icon-theme "Faenza-Dark"
+
+ # Disable Terminal Bell
+ dbus-launch gsettings set org.cinnamon.desktop.wm.preferences audible-bell false
+ dbus-launch gsettings set org.gnome.desktop.wm.preferences audible-bell false
fi
diff --git a/scripts/testing.sh b/scripts/testing.sh
index 237fd63ba..967905cad 100644
--- a/scripts/testing.sh
+++ b/scripts/testing.sh
@@ -3,11 +3,18 @@
previous="/tmp/dev-setup"
uefi="/sys/firmware/efi"
vbox_chk="$(hwinfo --gfxcard | grep -o -m 1 "VirtualBox")"
+notify="$1"
+notify_user () {
+ if [[ "${notify}" = "-n" ]]; then
+ notify-send -a "Cnchi" -i /usr/share/cnchi/data/antergos-icon.png "$1"
+ fi
+}
# Check if this is the first time we are executed.
if ! [ -f "${previous}" ]; then
touch ${previous};
# Find the best mirrors (fastest and latest)
+ notify_user "Selecting the best mirrors..."
echo "Selecting the best mirrors..."
echo "Testing Arch mirrors..."
reflector -p http -l 30 -f 5 --save /etc/pacman.d/mirrorlist;
@@ -18,6 +25,7 @@ if ! [ -f "${previous}" ]; then
cp /tmp/antergos-mirrorlist /etc/pacman.d/
echo "Done."
# Install any packages that haven't been added to the iso yet but are needed.
+ notify_user "Installing missing packages..."
echo "Installing missing packages..."
# Check if system is UEFI boot.
if [ -d "${uefi}" ]; then
@@ -38,6 +46,7 @@ if ! [ -f "${previous}" ]; then
echo "Removing existing Cnchi..."
rm -R /usr/share/cnchi;
cd /usr/share;
+ notify_user "Getting latest version of Cnchi from testing branch..."
echo "Getting latest version of Cnchi from testing branch..."
# Check commandline arguments to choose repo
if [ "$1" = "-d" ] || [ "$1" = "--dev-repo" ]; then
@@ -48,18 +57,21 @@ if ! [ -f "${previous}" ]; then
cd /usr/share/cnchi
else
- echo "Previous testing setup detected, skipping downloads"
+ notify_user "Previous testing setup detected, skipping downloads..."
+ echo "Previous testing setup detected, skipping downloads..."
echo "Verifying that nothing is mounted from a previous install attempt."
umount -lf /install/boot >/dev/null 2&>1
umount -lf /install >/dev/null 2&>1
# Check for changes on github since last time script was executed
# Update Cnchi with latest testing code
+ notify_user "Getting latest version of Cnchi from testing branch..."
echo "Getting latest version of Cnchi from testing branch..."
cd /usr/share/cnchi
git pull origin master;
fi
# Start Cnchi with appropriate options
+notify_user "Starting Cnchi..."
echo "Starting Cnchi..."
# Are we using an alternate PKG cache?
# TODO Remove this nonsense and use proper command argument processing