Fix a typo in project name and add some files under version control

20 files changed, 66 insertions, 59 deletions

diff --git a/.tx/config b/.tx/config
index 1801820..65fbeef 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,8 +1,8 @@
 [main]
 host = https://www.transifex.net
 
-[inital-setup.master]
-file_filter = locale/<lang>/LC_MESSAGES/inital-setup.po
-source_file = locale/inital-setup.pot
+[initial-setup.master]
+file_filter = locale/<lang>/LC_MESSAGES/initial-setup.po
+source_file = locale/initial-setup.pot
 source_lang = en
 type = PO
\ No newline at end of file
diff --git a/inital_setup/gui/hubs/__init__.py b/inital_setup/gui/hubs/__init__.py
deleted file mode 100644
index da350da..0000000
--- a/inital_setup/gui/hubs/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from inital_setup import InitalSetupMainHub
diff --git a/initial-setup b/initial-setup
new file mode 100755
index 0000000..980818b
--- /dev/null
+++ b/initial-setup
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ "x$DISPLAY" != "x" ]; then
+    python -m initial_setup.gui
+else
+    python -m initial_setup.tui
+fi
+
diff --git a/inital-setup.spec b/initial-setup.spec
index 5c47989..a83c48a 100644
--- a/inital-setup.spec
+++ b/initial-setup.spec
@@ -1,5 +1,5 @@
 Summary: Initial system configuration utility
-Name: inital-setup
+Name: initial-setup
 URL: http://fedoraproject.org/wiki/FirstBoot
 Version: 0.1
 Release: 1%{?dist}
@@ -39,7 +39,7 @@ Requires: libreport-python
 %global debug_package %{nil}
 
 %description
-The inital-setup utility runs after installation.  It guides the user through
+The initial-setup utility runs after installation.  It guides the user through
 a series of steps that allows for easier configuration of the machine.
 
 %prep
@@ -62,47 +62,47 @@ rm -rf ${buildroot}
 %find_lang %{name}
 
 %post
-if [ $1 -ne 2 -a ! -f /etc/sysconfig/inital-setup ]; then
+if [ $1 -ne 2 -a ! -f /etc/sysconfig/initial-setup ]; then
   platform="$(arch)"
   if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then
-    echo "RUN_INITAL_SETUP=YES" > /etc/sysconfig/inital-setup
+    echo "RUN_INITAL_SETUP=YES" > /etc/sysconfig/initial-setup
   else
-    %systemd_post inital-setup-graphical.service
-    %systemd_post inital-setup-text.service
-    %systemd_post inital-setup-xserver.service
+    %systemd_post initial-setup-graphical.service
+    %systemd_post initial-setup-text.service
+    %systemd_post initial-setup-xserver.service
   fi
 fi
 
 %preun
 if [ $1 = 0 ]; then
-  rm -rf /usr/share/inital-setup/*.pyc
-  rm -rf /usr/share/inital-setup/modules/*.pyc
+  rm -rf /usr/share/initial-setup/*.pyc
+  rm -rf /usr/share/initial-setup/modules/*.pyc
 fi
-%systemd_preun inital-setup-graphical.service
-%systemd_preun inital-setup-text.service
-%systemd_preun inital-setup-xserver.service
+%systemd_preun initial-setup-graphical.service
+%systemd_preun initial-setup-text.service
+%systemd_preun initial-setup-xserver.service
 
 %postun
-%systemd_postun_with_restart inital-setup-graphical.service
-%systemd_postun_with_restart inital-setup-text.service
-%systemd_postun_with_restart inital-setup-xserver.service
+%systemd_postun_with_restart initial-setup-graphical.service
+%systemd_postun_with_restart initial-setup-text.service
+%systemd_postun_with_restart initial-setup-xserver.service
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%dir %{_datadir}/inital-setup/
-%dir %{_datadir}/inital-setup/modules/
+%dir %{_datadir}/initial-setup/
+%dir %{_datadir}/initial-setup/modules/
 %{python_sitelib}/*
-%{_bindir}/inital-setup
-%{_datadir}/inital-setup/modules/*
+%{_bindir}/initial-setup
+%{_datadir}/initial-setup/modules/*
 
-/lib/systemd/system/inital-setup-graphical.service
-/lib/systemd/system/inital-setup-text.service
-/lib/systemd/system/inital-setup-xserver.service
+/lib/systemd/system/initial-setup-graphical.service
+/lib/systemd/system/initial-setup-text.service
+/lib/systemd/system/initial-setup-xserver.service
 
 %ifarch s390 s390x
 %dir %{_sysconfdir}/profile.d
-%{_sysconfdir}/profile.d/inital-setup.sh
-%{_sysconfdir}/profile.d/inital-setup.csh
+%{_sysconfdir}/profile.d/initial-setup.sh
+%{_sysconfdir}/profile.d/initial-setup.csh
 %endif
 
 
diff --git a/inital_setup/Makefile b/initial_setup/Makefile
index c3919fc..c3919fc 100644
--- a/inital_setup/Makefile
+++ b/initial_setup/Makefile
diff --git a/inital_setup/__init__.py b/initial_setup/__init__.py
index e69de29..e69de29 100644
--- a/inital_setup/__init__.py
+++ b/initial_setup/__init__.py
diff --git a/inital_setup/gui/__init__.py b/initial_setup/gui/__init__.py
index e69de29..e69de29 100644
--- a/inital_setup/gui/__init__.py
+++ b/initial_setup/gui/__init__.py
diff --git a/inital_setup/gui/__main__.py b/initial_setup/gui/__main__.py
index 288a552..af8c5e9 100644
--- a/inital_setup/gui/__main__.py
+++ b/initial_setup/gui/__main__.py
@@ -13,7 +13,7 @@ ROOT_PATH = "/"
 
 from pyanaconda.addons import collect_addon_paths
 
-addon_paths = ["/usr/share/inital-setup/modules", "/usr/share/anaconda/addons"]
+addon_paths = ["/usr/share/initial-setup/modules", "/usr/share/anaconda/addons"]
 addon_module_paths = collect_addon_paths(addon_paths)
 
 # Too bad anaconda does not have modularized logging
diff --git a/inital_setup/gui/gui.py b/initial_setup/gui/gui.py
index 40cadb5..ea280b3 100644
--- a/inital_setup/gui/gui.py
+++ b/initial_setup/gui/gui.py
@@ -26,7 +26,7 @@ class InitalSetupGraphicalUserInterface(GraphicalUserInterface):
        anaconda to make the look & feel as similar as possible.
     """
 
-    screenshots_directory = "/tmp/inital-setup-screenshots"
+    screenshots_directory = "/tmp/initial-setup-screenshots"
     
     @usesclassinject
     def __init__(self, storage, payload, instclass):
diff --git a/initial_setup/gui/hubs/__init__.py b/initial_setup/gui/hubs/__init__.py
new file mode 100644
index 0000000..b6f577d
--- /dev/null
+++ b/initial_setup/gui/hubs/__init__.py
@@ -0,0 +1 @@
+from initial_setup import InitalSetupMainHub
diff --git a/inital_setup/gui/hubs/inital_setup.glade b/initial_setup/gui/hubs/initial_setup.glade
index 75ff936..75ff936 100644
--- a/inital_setup/gui/hubs/inital_setup.glade
+++ b/initial_setup/gui/hubs/initial_setup.glade
diff --git a/inital_setup/gui/hubs/inital_setup.py b/initial_setup/gui/hubs/initial_setup.py
index 2a59b77..a0f87db 100644
--- a/inital_setup/gui/hubs/inital_setup.py
+++ b/initial_setup/gui/hubs/initial_setup.py
@@ -24,7 +24,7 @@ def collect_spokes(mask_paths):
 
 
 class InitalSetupMainHub(Hub):
-    uiFile = "inital_setup.glade"
+    uiFile = "initial_setup.glade"
     builderObjects = ["summaryWindow"]
     mainWidgetName = "summaryWindow"
     
diff --git a/inital_setup/gui/spokes/__init__.py b/initial_setup/gui/spokes/__init__.py
index e69de29..e69de29 100644
--- a/inital_setup/gui/spokes/__init__.py
+++ b/initial_setup/gui/spokes/__init__.py
diff --git a/locale/cs_CZ/LC_MESSAGES/inital-setup.po b/locale/cs_CZ/LC_MESSAGES/initial-setup.po
index 70661d5..189caf7 100644
--- a/locale/cs_CZ/LC_MESSAGES/inital-setup.po
+++ b/locale/cs_CZ/LC_MESSAGES/initial-setup.po
@@ -1,12 +1,12 @@
-# Czech (Czech Republic) translations for inital-setup.
+# Czech (Czech Republic) translations for initial-setup.
 # Copyright (C) 2013 Red Hat
-# This file is distributed under the same license as the inital-setup
+# This file is distributed under the same license as the initial-setup
 # project.
 # Martin Sivák <msivak@redhat.com>, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: inital-setup 0.1\n"
+"Project-Id-Version: initial-setup 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2013-01-11 15:10+0100\n"
 "PO-Revision-Date: 2013-01-11 15:12+0100\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: inital_setup/gui/gui.py:20
+#: initial_setup/gui/gui.py:20
 msgid ""
 "Are you sure you want to quit the configuration process?\n"
 "You might end up with unusable system if you do."
diff --git a/locale/inital-setup.pot b/locale/initial-setup.pot
index fbea694..44ea292 100644
--- a/locale/inital-setup.pot
+++ b/locale/initial-setup.pot
@@ -1,13 +1,13 @@
-# Translations template for inital-setup.
+# Translations template for initial-setup.
 # Copyright (C) 2013 ORGANIZATION
-# This file is distributed under the same license as the inital-setup
+# This file is distributed under the same license as the initial-setup
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: inital-setup 0.1\n"
+"Project-Id-Version: initial-setup 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2013-01-11 15:10+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: inital_setup/gui/gui.py:20
+#: initial_setup/gui/gui.py:20
 msgid ""
 "Are you sure you want to quit the configuration process?\n"
 "You might end up with unusable system if you do."
diff --git a/scripts/inital-setup.csh b/scripts/initial-setup.csh
index 85f7534..8ea1975 100644
--- a/scripts/inital-setup.csh
+++ b/scripts/initial-setup.csh
@@ -1,7 +1,7 @@
-# inital-setup.csh
+# initial-setup.csh
 
-set IS_EXEC = /usr/sbin/inital-setup
-set IS_CONF = /etc/sysconfig/inital-setup
+set IS_EXEC = /usr/sbin/initial-setup
+set IS_CONF = /etc/sysconfig/initial-setup
 
 # check if we should run firstboot
 grep -i "RUN_INITAL_SETUP=NO" $IS_CONF >/dev/null
diff --git a/scripts/inital-setup.sh b/scripts/initial-setup.sh
index bf5d774..511e70c 100644
--- a/scripts/inital-setup.sh
+++ b/scripts/initial-setup.sh
@@ -1,7 +1,7 @@
 # firstboot.sh
 
-IS_EXEC=/usr/sbin/inital-setup
-IS_CONF=/etc/sysconfig/inital-setup
+IS_EXEC=/usr/sbin/initial-setup
+IS_CONF=/etc/sysconfig/initial-setup
 
 # source the config file
 [ -f $IS_CONF ] && . $IS_CONF
diff --git a/setup.py b/setup.py
index 86ab48b..5a05351 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Setup file for inital-setup
+# Setup file for initial-setup
 #
 # Copyright (C) 2012  Red Hat, Inc.
 #
@@ -34,33 +34,33 @@ def read(fname):
 
 
 data_files = [('/lib/systemd/system', glob('systemd/*.service')),
-              ('/usr/share/inital-setup/modules', glob('modules/*'))]
+              ('/usr/share/initial-setup/modules', glob('modules/*'))]
 
 # add localization files
 data_files += [('/usr/share/locale/%s/LC_MESSAGES' % dirname,
-                ['locale/%s/LC_MESSAGES/inital-setup.mo' % dirname])
+                ['locale/%s/LC_MESSAGES/initial-setup.mo' % dirname])
                 for dirname in os.listdir("locale")
                 if not dirname.endswith(".pot")]
 
 # add the firstboot start script for s390 architectures
 if os.uname()[4].startswith('s390'):
-    data_files.append(('/etc/profile.d', ['scripts/inital-setup.sh']))
-    data_files.append(('/etc/profile.d', ['scripts/inital-setup.csh']))
+    data_files.append(('/etc/profile.d', ['scripts/initial-setup.sh']))
+    data_files.append(('/etc/profile.d', ['scripts/initial-setup.csh']))
 
 setup(
-    name = "inital-setup",
+    name = "initial-setup",
     version = "0.1",
     author = "Martin Sivak",
     author_email = "msivak@redhat.com",
     description='Post-installation configuration utility',
     url='http://fedoraproject.org/wiki/FirstBoot',
     license = "GPLv2+",
-    keywords = "firstboot inital setup",
+    keywords = "firstboot initial setup",
     packages = find_packages(),
-    scripts = ["inital-setup"],
+    scripts = ["initial-setup"],
     data_files = data_files,
     setup_requires= ['nose>=1.0'],
-    test_suite = "inital_setup",
+    test_suite = "initial_setup",
     long_description=read('README'),
     classifiers=[
         "Development Status :: 3 - Alpha",
diff --git a/systemd/inital-setup-graphical.service b/systemd/initial-setup-graphical.service
index c996e4d..b4526ad 100644
--- a/systemd/inital-setup-graphical.service
+++ b/systemd/initial-setup-graphical.service
@@ -2,14 +2,14 @@
 Description=Inital Setup configuration program
 After=livesys.service plymouth-quit.service
 Before=display-manager.service getty@tty1.service
-Conflicts=plymouth-quit.service inital-setup-text.service
-PartOf=inital-setup-xserver.service
+Conflicts=plymouth-quit.service initial-setup-text.service
+PartOf=initial-setup-xserver.service
 
 [Service]
 Type=oneshot
 ExecStartPre=-/bin/plymouth quit
-ExecStart=DISPLAY=:9 /usr/sbin/inital-setup
-ExecStartPost=/bin/systemctl disable inital-setup-graphical.service
+ExecStart=DISPLAY=:9 /usr/sbin/initial-setup
+ExecStartPost=/bin/systemctl disable initial-setup-graphical.service
 TimeoutSec=0
 RemainAfterExit=yes
 SysVStartPriority=99
diff --git a/systemd/inital-setup-text.service b/systemd/initial-setup-text.service
index dadb7a3..7dd9945 100644
--- a/systemd/inital-setup-text.service
+++ b/systemd/initial-setup-text.service
@@ -8,8 +8,8 @@ Conflicts=plymouth-quit.service
 [Service]
 Type=oneshot
 ExecStartPre=-/bin/plymouth quit
-ExecStart=/usr/sbin/inital-setup
-ExecStartPost=/bin/systemctl disable inital-setup-text.service
+ExecStart=/usr/sbin/initial-setup
+ExecStartPost=/bin/systemctl disable initial-setup-text.service
 TimeoutSec=0
 RemainAfterExit=yes
 SysVStartPriority=99