Skip to content
This repository has been archived by the owner on May 22, 2019. It is now read-only.

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
karasu committed May 4, 2014
2 parents 2ce12b4 + 992491d commit c853123
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 26 deletions.
40 changes: 26 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,39 @@ Usage: sudo -E cnchi.py

To create logs to help debug problems: sudo -E cnchi.py -dv

## Translations

We manage our translations in transifex:

* https://www.transifex.com/projects/p/antergos/

## Dependencies

* gtk 3
* python 3
* python-gobject 3
* python-dbus
* gtk3
* python3
* python-cairo
* python-dbus
* python-gobject
* python-mako
* pyparted (parted, dosfstools, mtools, ntfs-3g, ntfsprogs)
* pyalpm (pacman)
* libtimezonemap
* webkitgtk
* parted (dosfstools, mtools, ntfs-3g, ntfsprogs)
* py3parted (pyparted on python3) -> https://github.com/antergos/antergos-packages/tree/master/py3parted
* pacman
* pyalpm
* hwinfo
* webkitgtk
* hdparm
* hwinfo
* upower
* python-mock (only needed for unit tests)

#### Unit tests

## Translations
* python-mock

We manage our translations in transifex:
#### Fonts needed by the keyboard widget

* ttf-aboriginal-sans
* ttf-indic-otf
* ttf-khmer
* ttf-lohit-fonts
* ttf-myanmar3
* ttf-thaana-fonts
* ttf-tlwg

* https://www.transifex.com/projects/p/antergos/
2 changes: 2 additions & 0 deletions data/packages.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@
<pkgname>gnome-screenshot</pkgname>
<pkgname>gnome-shell</pkgname>
<pkgname>gnome-shell-extensions</pkgname>
<!-- <pkgname>gnome-shell-extension-dash-to-dock</pkgname> -->
<pkgname>gnome-shell-extension-lockscreen-lightdm</pkgname>
<pkgname>gnome-system-monitor</pkgname>
<pkgname>gnome-terminal</pkgname>
<pkgname>gnome-themes-standard</pkgname>
Expand Down
24 changes: 23 additions & 1 deletion scripts/postinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,29 @@ gnome_settings(){

## Set defaults directories
chroot ${DESTDIR} su -c xdg-user-dirs-update ${USER_NAME}
}


# xscreensaver config
cat << EOF > ${DESTDIR}/home/${USER_NAME}/.xscreensaver
newLoginCommand: dm-tool switch-to-greeter
timeout: 0:10:00
EOF

cp ${DESTDIR}/home/${USER_NAME}/.xscreensaver ${DESTDIR}/etc/skel

cat << EOF > ${DESTDIR}/etc/xdg/autostart/xscreensaver.desktop
[Desktop Entry]
Name=xscreensaver
Exec=/usr/bin/xscreensaver -no-splash &
Terminal=false
Type=Application
Icon=screensaver
StartupNotify=false
X-GNOME-Autostart-Delay=30
Categories=System;Display;GTK;
EOF

}

cinnamon_settings(){
# Set Adwaita cursor theme
Expand Down
3 changes: 3 additions & 0 deletions scripts/set-settings
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ if [[ ${DESKTOP} == 'gnome' ]];then

# Set icon theme
dbus-launch gsettings set org.gnome.desktop.interface icon-theme "Faenza-Dark"

# Enable lockscreen extension
dbus-launch gsettings set org.gnome.shell enabled-extensions "['[email protected]']"

fi

Expand Down
2 changes: 1 addition & 1 deletion src/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

""" Set some Cnchi global constants """

CNCHI_VERSION = "0.5.41"
CNCHI_VERSION = "0.5.42"
CNCHI_LAST_STABLE = "0.4.3"
CNCHI_WEBSITE = "http://www.antergos.com"

Expand Down
21 changes: 11 additions & 10 deletions src/installation/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -1396,16 +1396,17 @@ def copy_files_progress(self, src, dst):
""" Copy files updating the slides' progress bar """
percent = 0.0
items = os.listdir(src)
step = 1.0 / len(items)
for item in items:
self.queue_event('percent', percent)
source = os.path.join(src, item)
destination = os.path.join(dst, item)
try:
shutil.copy2(source, destination)
except (FileExistsError, shutil.Error) as err:
logging.warning(err)
percent += step
if len(items) > 0:
step = 1.0 / len(items)
for item in items:
self.queue_event('percent', percent)
source = os.path.join(src, item)
destination = os.path.join(dst, item)
try:
shutil.copy2(source, destination)
except (FileExistsError, shutil.Error) as err:
logging.warning(err)
percent += step

def setup_features(self):
""" Do all set up needed by the user's selected features """
Expand Down

0 comments on commit c853123

Please sign in to comment.