From 16947523af059656a24a3b1699491150984eba41 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Mon, 5 May 2014 04:38:47 -0500 Subject: [PATCH 1/6] Convert readme to remarkup --- README.md | 68 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 25f42f4fc..0958cb5ad 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 From 4a24202e2d84a73ffac28cbe632e611783eb73c5 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Mon, 5 May 2014 04:46:34 -0500 Subject: [PATCH 2/6] typo --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0958cb5ad..014539245 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ **Graphical Installer for Antergos Linux (FKA Cinnarch Linux)** Usage: -lang=sh -```sudo -E cnchi.py``` +```lang=sh +sudo -E cnchi.py``` To create logs to help debug problems: -lang=sh -```sudo -E cnchi.py -dv``` +```lang=sh +sudo -E cnchi.py -dv``` ==Translations From e4529c0edb81ad92f59cafc95bb3fbe0c46f974c Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Tue, 6 May 2014 04:21:00 -0500 Subject: [PATCH 3/6] add missing cinnamon dependancy; disable terminal bell in gnome and cinnamon --- data/packages.xml | 1 + scripts/set-settings | 7 +++++++ 2 files changed, 8 insertions(+) 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/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 From cc4765920290d4e6bccdf19d1a3edf39224586f5 Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Wed, 7 May 2014 01:06:07 -0500 Subject: [PATCH 4/6] added status updates via notify-send when testing script is launched using "cnchi-dev" command. --- scripts/testing.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 From fbc9d3548b020c80b4f6fe2dad3ed58c0298afde Mon Sep 17 00:00:00 2001 From: karasu Date: Fri, 9 May 2014 20:05:15 +0200 Subject: [PATCH 5/6] Added fonts.conf --- scripts/fonts.conf | 34 ++++++++++++++++++++++++++++++++++ scripts/postinstall.sh | 6 ++++++ 2 files changed, 40 insertions(+) create mode 100644 scripts/fonts.conf 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..afb37b92b 100755 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -386,6 +386,12 @@ postinstall(){ if [[ $DESKTOP != 'nox' ]];then set_synaptics fi + + # Configure fontconfig + FONTS_CONF="/usr/share/cnchi/scripts/fonts.conf" + if [ -f $FONTS_CONF ]; then + cp $FONTS_CONF ${DESTDIR}/etc + fi # Set Antergos name in filesystem files cp /etc/arch-release ${DESTDIR}/etc From 7f580c51c29ad5351b5e3ee8d997152cc9586b27 Mon Sep 17 00:00:00 2001 From: karasu Date: Fri, 9 May 2014 20:12:25 +0200 Subject: [PATCH 6/6] make it user wide --- scripts/postinstall.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index afb37b92b..4244b193d 100755 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -388,9 +388,11 @@ postinstall(){ fi # Configure fontconfig - FONTS_CONF="/usr/share/cnchi/scripts/fonts.conf" - if [ -f $FONTS_CONF ]; then - cp $FONTS_CONF ${DESTDIR}/etc + 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