summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoru <u@451f.org>2015-10-26 22:25:40 +0100
committerintrigeri <intrigeri@boum.org>2015-10-31 14:40:10 +0000
commit7bf61b0d3952f6dd238ba034a5b02e004f199e39 (patch)
treea05f065a80fa6dffda3ace1fcbd6969a1b2cdeea
parent8af13288af7d9017cad2d9e23c52d1e3a1ac706f (diff)
Rename liveusb-creator to Tails Installerfeature/8552+rename-tails-installer
Renaming software, files, classes so that we would not steal LiveUSBCreator's namespace. See Tails #8552.
-rw-r--r--MANIFEST.in42
-rw-r--r--README.txt16
-rw-r--r--data/liveusb-creator-nsis.desktop6
-rw-r--r--data/tails-installer-launcher.desktop (renamed from data/liveusb-creator-launcher.desktop)2
-rw-r--r--data/tails-installer-launcher.ui (renamed from data/liveusb-creator-launcher.ui)0
-rw-r--r--data/tails-installer-nsis.desktop6
-rw-r--r--data/tails-installer.desktop (renamed from data/liveusb-creator.desktop)4
-rw-r--r--data/tails-installer.nsi (renamed from data/liveusb-creator.nsi)48
-rwxr-xr-xdata/tails-installer.nsi.in (renamed from data/liveusb-creator.nsi.in)46
-rw-r--r--data/tails-installer.ui (renamed from data/liveusb-creator.ui)0
-rw-r--r--po/POTFILES.in30
-rw-r--r--po/tails-installer.pot (renamed from po/liveusb-creator.pot)269
-rw-r--r--release.bat16
-rwxr-xr-xsetup.py34
-rwxr-xr-xtails-installer (renamed from liveusb-creator)10
-rwxr-xr-xtails-installer-launcher (renamed from liveusb-creator-launcher)4
-rw-r--r--tails-installer-launcher.1.markdown (renamed from liveusb-creator-launcher.1.markdown)10
-rw-r--r--tails-installer.1.markdown (renamed from liveusb-creator.1.markdown)6
-rw-r--r--tails-installer.console (renamed from liveusb-creator.console)2
-rw-r--r--tails-installer.pam (renamed from liveusb-creator.pam)0
-rw-r--r--tails_installer/__init__.py (renamed from liveusb/__init__.py)14
-rw-r--r--tails_installer/config.py (renamed from liveusb/config.py)2
-rwxr-xr-xtails_installer/creator.py (renamed from liveusb/creator.py)112
-rwxr-xr-xtails_installer/gui.py (renamed from liveusb/gui.py)50
-rw-r--r--tails_installer/launcher.py (renamed from liveusb/launcher.py)24
-rw-r--r--tails_installer/olpc.py (renamed from liveusb/olpc.py)0
-rw-r--r--tails_installer/releases.py (renamed from liveusb/releases.py)0
-rw-r--r--tails_installer/source.py (renamed from liveusb/source.py)8
-rw-r--r--tails_installer/urlgrabber/__init__.py (renamed from liveusb/urlgrabber/__init__.py)0
-rw-r--r--tails_installer/urlgrabber/byterange.py (renamed from liveusb/urlgrabber/byterange.py)0
-rw-r--r--tails_installer/urlgrabber/grabber.py (renamed from liveusb/urlgrabber/grabber.py)0
-rw-r--r--tails_installer/urlgrabber/keepalive.py (renamed from liveusb/urlgrabber/keepalive.py)0
-rw-r--r--tails_installer/urlgrabber/mirror.py (renamed from liveusb/urlgrabber/mirror.py)0
-rw-r--r--tails_installer/urlgrabber/progress.py (renamed from liveusb/urlgrabber/progress.py)0
-rw-r--r--tails_installer/utils.py (renamed from liveusb/utils.py)10
-rw-r--r--tests/test_creator.py18
36 files changed, 390 insertions, 399 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index cf3f6da..de83d9a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,27 +1,27 @@
include README.txt
include Makefile
include LICENSE.txt
-include liveusb-creator
-include liveusb-creator-launcher
+include tails-installer
+include tails-installer-launcher
include setup.py
-include liveusb/__init__.py
-include liveusb/creator.py
-include liveusb/dialog.py
-include liveusb/gui.py
-include liveusb/launcher.py
-include liveusb/releases.py
-include liveusb/urlgrabber/__init__.py
-include liveusb/urlgrabber/byterange.py
-include liveusb/urlgrabber/grabber.py
-include liveusb/urlgrabber/keepalive.py
-include liveusb/urlgrabber/mirror.py
-include liveusb/urlgrabber/progress.py
-include data/liveusb-creator.ui
-include data/liveusb-creator-launcher.ui
-include data/liveusb-creator.desktop
-include data/tails-liveusb-header.png
+include tails_installer/__init__.py
+include tails_installer/creator.py
+include tails_installer/dialog.py
+include tails_installer/gui.py
+include tails_installer/launcher.py
+include tails_installer/releases.py
+include tails_installer/urlgrabber/__init__.py
+include tails_installer/urlgrabber/byterange.py
+include tails_installer/urlgrabber/grabber.py
+include tails_installer/urlgrabber/keepalive.py
+include tails_installer/urlgrabber/mirror.py
+include tails_installer/urlgrabber/progress.py
+include data/tails-installer.ui
+include data/tails-installer-launcher.ui
+include data/tails-installer.desktop
+include data/tails-tails_installer-header.png
include data/usb-creator-gtk.svg
-include liveusb-creator.console
-include liveusb-creator.pam
-include liveusb-creator.spec
+include tails-installer.console
+include tails-installer.pam
+include tails-installer.spec
include po/*.po
diff --git a/README.txt b/README.txt
index dffc259..b19667a 100644
--- a/README.txt
+++ b/README.txt
@@ -1,26 +1,14 @@
===============
-liveusb-creator
+tails-installer
===============
A cross-platform tool for easily installing live operating systems on to USB
flash drives.
-Using
------
-See the wiki for instructions on how to use the liveusb-creator:
-
- https://fedorahosted.org/liveusb-creator
-
-Developing
-----------
-See the Developers Guide on the wiki for details,
-
- https://fedorahosted.org/liveusb-creator/wiki/Development
-
License
-------
-The liveusb-creator is licensed under the GPLv2.
+The tails-installer is licensed under the GPLv2.
This tool is distributed with the following open source software::
diff --git a/data/liveusb-creator-nsis.desktop b/data/liveusb-creator-nsis.desktop
deleted file mode 100644
index c8b840c..0000000
--- a/data/liveusb-creator-nsis.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-s_InstallHere=Select the directory to install LiveUSB Creator in:
-s_InstallHere[fr]=Choisir le dossier où installer « LiveUSB Creator » :
-s_RunNow=Run LiveUSB Creator now?
-s_RunNow[fr]=Lancer « LiveUSB Creator » maintenant ?
-s_UnInstall=This will uninstall LiveUSB Creator from your system.
-s_UnInstall[fr]=Ceci va désinstaller « LiveUSB Creator » de votre système.
diff --git a/data/liveusb-creator-launcher.desktop b/data/tails-installer-launcher.desktop
index 11814aa..5f4f18d 100644
--- a/data/liveusb-creator-launcher.desktop
+++ b/data/tails-installer-launcher.desktop
@@ -7,7 +7,7 @@ Comment=Install, clone, upgrade Tails
Comment[fr]=Installer, cloner, mettre à jour Tails
Comment[sv]=Installera, klona, uppgradera Tails
Icon=usb-creator-gtk.svg
-Exec=liveusb-creator-launcher
+Exec=tails-installer-launcher
Terminal=false
Categories=System;Tails;
Keywords=Tails;Install;Upgrade;Update;Copy;Clone;Installer;USB;Installation;Anonymity;Tor;Anonymous;SD;Amnesic;Amnesia;
diff --git a/data/liveusb-creator-launcher.ui b/data/tails-installer-launcher.ui
index 2a75c8a..2a75c8a 100644
--- a/data/liveusb-creator-launcher.ui
+++ b/data/tails-installer-launcher.ui
diff --git a/data/tails-installer-nsis.desktop b/data/tails-installer-nsis.desktop
new file mode 100644
index 0000000..765b2b2
--- /dev/null
+++ b/data/tails-installer-nsis.desktop
@@ -0,0 +1,6 @@
+s_InstallHere=Select the directory to install Tails Installer in:
+s_InstallHere[fr]=Choisir le dossier où installer « Tails Installer » :
+s_RunNow=Run Tails Installer now?
+s_RunNow[fr]=Lancer « Tails Installer » maintenant ?
+s_UnInstall=This will uninstall Tails Installer from your system.
+s_UnInstall[fr]=Ceci va désinstaller « Tails Installer » de votre système.
diff --git a/data/liveusb-creator.desktop b/data/tails-installer.desktop
index de93859..0fae394 100644
--- a/data/liveusb-creator.desktop
+++ b/data/tails-installer.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Type=Application
-Name=LiveUSB Creator
+Name=Tails Installer
Comment=Write operating system images to a USB device
Icon=usb-creator-gtk.svg
-Exec=liveusb-creator
+Exec=tails-installer
Terminal=false
Categories=System;
diff --git a/data/liveusb-creator.nsi b/data/tails-installer.nsi
index 8412a13..162b809 100644
--- a/data/liveusb-creator.nsi
+++ b/data/tails-installer.nsi
@@ -1,5 +1,5 @@
-Name "LiveUSB Creator 3.11.8"
-OutFile "liveusb-creator-3.11.8-setup.exe"
+Name "Tails Installer 3.11.8"
+OutFile "tails-installer-3.11.8-setup.exe"
!include "MUI2.nsh"
XPStyle on
@@ -9,19 +9,19 @@ XPStyle on
SetCompressor lzma
-InstallDir "$PROGRAMFILES\LiveUSB Creator"
-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\LiveUSB Creator" ""
+InstallDir "$PROGRAMFILES\Tails Installer"
+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Tails Installer" ""
-DirText "Select the directory to install LiveUSB Creator in:"
+DirText "Select the directory to install Tails Installer in:"
-!define MUI_ICON liveusb-creator.ico
-;!define MUI_UNICON liveusb-creator.ico
+!define MUI_ICON tails-installer.ico
+;!define MUI_UNICON tails-installer.ico
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_FINISHPAGE_RUN $INSTDIR\liveusb-creator.exe
+!define MUI_FINISHPAGE_RUN $INSTDIR\tails-installer.exe
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM
@@ -99,7 +99,7 @@ Section ""
vcredist_install_finished:
Delete "$INSTDIR\vcredist_x86.exe"
- File liveusb-creator.exe
+ File tails-installer.exe
File LICENSE.txt
File README.txt
File w9xpopen.exe
@@ -114,35 +114,35 @@ Section ""
; Create shortcut.
SetOutPath -
- CreateDirectory "$SMPROGRAMS\LiveUSB Creator"
- CreateShortCut "$SMPROGRAMS\LiveUSB Creator\LiveUSB Creator.lnk" "$INSTDIR\liveusb-creator.exe"
- CreateShortCut "$SMPROGRAMS\LiveUSB Creator\Uninstall LiveUSB Creator.lnk" "$INSTDIR\uninst.exe" "" "$INSTDIR\uninst.exe" 0
+ CreateDirectory "$SMPROGRAMS\Tails Installer"
+ CreateShortCut "$SMPROGRAMS\Tails Installer\Tails Installer.lnk" "$INSTDIR\tails-installer.exe"
+ CreateShortCut "$SMPROGRAMS\Tails Installer\Uninstall Tails Installer.lnk" "$INSTDIR\uninst.exe" "" "$INSTDIR\uninst.exe" 0
; Create uninstaller.
- WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\LiveUSB Creator" "" "$INSTDIR"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\LiveUSB Creator" "DisplayName" "LiveUSB Creator (remove only)"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\LiveUSB Creator" "UninstallString" '"$INSTDIR\uninst.exe"'
+ WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Tails Installer" "" "$INSTDIR"
+ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tails Installer" "DisplayName" "Tails Installer (remove only)"
+ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tails Installer" "UninstallString" '"$INSTDIR\uninst.exe"'
WriteUninstaller "$INSTDIR\uninst.exe"
SectionEnd
-UninstallText "This will uninstall LiveUSB Creator from your system."
+UninstallText "This will uninstall Tails Installer from your system."
Section Uninstall
; Delete shortcuts.
- Delete "$SMPROGRAMS\LiveUSB Creator\LiveUSB Creator.lnk"
- Delete "$SMPROGRAMS\LiveUSB Creator\Uninstall LiveUSB Creator.lnk"
- RMDir "$SMPROGRAMS\LiveUSB Creator"
- Delete "$DESKTOP\LiveUSB Creator.lnk"
+ Delete "$SMPROGRAMS\Tails Installer\Tails Installer.lnk"
+ Delete "$SMPROGRAMS\Tails Installer\Uninstall Tails Installer.lnk"
+ RMDir "$SMPROGRAMS\Tails Installer"
+ Delete "$DESKTOP\Tails Installer.lnk"
; Delete registry keys.
Delete "$INSTDIR\uninst.exe"
- DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\LiveUSB Creator"
- DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\LiveUSB Creator"
+ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Tails Installer"
+ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Tails Installer"
; Delete files.
- Delete "$INSTDIR\liveusb-creator.exe"
+ Delete "$INSTDIR\tails-installer.exe"
Delete "$INSTDIR\LICENSE.txt"
Delete "$INSTDIR\README.txt"
Delete "$INSTDIR\w9xpopen.exe"
@@ -153,7 +153,7 @@ Section Uninstall
Delete "$INSTDIR\tools\dd.exe"
Delete "$INSTDIR\tools\syslinux.exe"
- Delete "$INSTDIR\liveusb-creator.exe.log"
+ Delete "$INSTDIR\tails-installer.exe.log"
; Remove the installation directories.
RMDir /R "$INSTDIR\locale"
diff --git a/data/liveusb-creator.nsi.in b/data/tails-installer.nsi.in
index 8beba06..c546117 100755
--- a/data/liveusb-creator.nsi.in
+++ b/data/tails-installer.nsi.in
@@ -1,8 +1,8 @@
;--------------------------------
-;LiveUSB Creator NSIS script
+;Tails Installer NSIS script
-Name "LiveUSB Creator 3.11.8"
-OutFile "liveusb-creator-3.11.8-setup.exe"
+Name "Tails Installer 3.11.8"
+OutFile "tails-installer-3.11.8-setup.exe"
SetCompressor lzma
@@ -15,7 +15,7 @@ SetCompressor lzma
; Interface Configuration
!define MUI_HEADERIMAGE
- !define MUI_HEADERIMAGE_BITMAP "${LC_NSIS_INCLUDE_PATH}\liveusb-creator-nsi.bmp"
+ !define MUI_HEADERIMAGE_BITMAP "${LC_NSIS_INCLUDE_PATH}\tails-installer-nsi.bmp"
!define MUI_ABORTWARNING
;--------------------------------
@@ -32,12 +32,12 @@ SetCompressor lzma
@INSERT_TRANSLATIONS@
;--------------------------------
-InstallDir "$PROGRAMFILES\LiveUSB Creator"
-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\LiveUSB Creator" ""
+InstallDir "$PROGRAMFILES\Tails Installer"
+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Tails Installer" ""
DirText $(s_InstallHere)
-Icon liveusb-creator.ico
+Icon tails-installer.ico
Section "Dummy Section" SecDummy
@@ -45,7 +45,7 @@ Section "Dummy Section" SecDummy
SetOverwrite on
SetOutPath "$INSTDIR"
- File liveusb-creator.exe
+ File tails-installer.exe
File LICENSE.txt
File README.txt
File MSVCP90.dll
@@ -63,19 +63,19 @@ Section "Dummy Section" SecDummy
; Create shortcut.
SetOutPath -
- CreateDirectory "$SMPROGRAMS\LiveUSB Creator"
- CreateShortCut "$SMPROGRAMS\LiveUSB Creator\LiveUSB Creator.lnk" "$INSTDIR\liveusb-creator.exe"
- CreateShortCut "$SMPROGRAMS\LiveUSB Creator\Uninstall LiveUSB Creator.lnk" "$INSTDIR\uninst.exe" "" "$INSTDIR\uninst.exe" 0
+ CreateDirectory "$SMPROGRAMS\Tails Installer"
+ CreateShortCut "$SMPROGRAMS\Tails Installer\Tails Installer.lnk" "$INSTDIR\tails-installer.exe"
+ CreateShortCut "$SMPROGRAMS\Tails Installer\Uninstall Tails Installer.lnk" "$INSTDIR\uninst.exe" "" "$INSTDIR\uninst.exe" 0
; Optionally start program.
MessageBox MB_YESNO|MB_ICONQUESTION $(s_RunNow) IDNO SkipRunProgram
- Exec "$INSTDIR\liveusb-creator.exe"
+ Exec "$INSTDIR\tails-installer.exe"
SkipRunProgram:
; Create uninstaller.
- WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\LiveUSB Creator" "" "$INSTDIR"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\LiveUSB Creator" "DisplayName" "LiveUSB Creator (remove only)"
- WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\LiveUSB Creator" "UninstallString" '"$INSTDIR\uninst.exe"'
+ WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Tails Installer" "" "$INSTDIR"
+ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tails Installer" "DisplayName" "Tails Installer (remove only)"
+ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tails Installer" "UninstallString" '"$INSTDIR\uninst.exe"'
WriteUninstaller "$INSTDIR\uninst.exe"
SectionEnd
@@ -85,18 +85,18 @@ UninstallText $(s_UnInstall)
Section Uninstall
; Delete shortcuts.
- Delete "$SMPROGRAMS\LiveUSB Creator\LiveUSB Creator.lnk"
- Delete "$SMPROGRAMS\LiveUSB Creator\Uninstall LiveUSB Creator.lnk"
- RMDir "$SMPROGRAMS\LiveUSB Creator"
- Delete "$DESKTOP\LiveUSB Creator.lnk"
+ Delete "$SMPROGRAMS\Tails Installer\Tails Installer.lnk"
+ Delete "$SMPROGRAMS\Tails Installer\Uninstall Tails Installer.lnk"
+ RMDir "$SMPROGRAMS\Tails Installer"
+ Delete "$DESKTOP\Tails Installer.lnk"
; Delete registry keys.
Delete "$INSTDIR\uninst.exe"
- DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\LiveUSB Creator"
- DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\LiveUSB Creator"
+ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Tails Installer"
+ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Tails Installer"
; Delete files.
- Delete "$INSTDIR\liveusb-creator.exe"
+ Delete "$INSTDIR\tails-installer.exe"
Delete "$INSTDIR\LICENSE.txt"
Delete "$INSTDIR\README.txt"
Delete "$INSTDIR\MSVCP90.DLL"
@@ -110,7 +110,7 @@ Section Uninstall
Delete "$INSTDIR\tools\dd.exe"
Delete "$INSTDIR\tools\syslinux.exe"
- Delete "$INSTDIR\liveusb-creator.exe.log"
+ Delete "$INSTDIR\tails-installer.exe.log"
; Remove the installation directories.
RMDir "$INSTDIR\tools"
diff --git a/data/liveusb-creator.ui b/data/tails-installer.ui
index fbc9187..fbc9187 100644
--- a/data/liveusb-creator.ui
+++ b/data/tails-installer.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b1d2f6e..2e78753 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,18 +1,18 @@
[encoding: UTF-8]
-liveusb/__init__.py
-liveusb/creator.py
-liveusb/gui.py
-liveusb/launcher.py
-liveusb/source.py
-liveusb/urlgrabber/byterange.py
-liveusb/urlgrabber/grabber.py
-liveusb/urlgrabber/keepalive.py
-liveusb/urlgrabber/mirror.py
-liveusb/urlgrabber/progress.py
-liveusb/utils.py
+tails_installer/__init__.py
+tails_installer/creator.py
+tails_installer/gui.py
+tails_installer/launcher.py
+tails_installer/source.py
+tails_installer/urlgrabber/byterange.py
+tails_installer/urlgrabber/grabber.py
+tails_installer/urlgrabber/keepalive.py
+tails_installer/urlgrabber/mirror.py
+tails_installer/urlgrabber/progress.py
+tails_installer/utils.py
-data/liveusb-creator.ui.h
-data/liveusb-creator-launcher.ui.h
+data/tails-installer.ui.h
+data/tails-installer-launcher.ui.h
-liveusb-creator
-liveusb-creator-launcher
+tails-installer
+tails-installer-launcher
diff --git a/po/liveusb-creator.pot b/po/tails-installer.pot
index 1bcead0..c7cfc95 100644
--- a/po/liveusb-creator.pot
+++ b/po/tails-installer.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-14 23:37+0200\n"
+"POT-Creation-Date: 2015-10-26 22:53+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,360 +17,360 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../liveusb/creator.py:98
+#: ../tails_installer/creator.py:98
msgid "You must run this application as root"
msgstr ""
-#: ../liveusb/creator.py:140
+#: ../tails_installer/creator.py:140
msgid "Source type does not support verification of ISO MD5 checksum, skipping"
msgstr ""
-#: ../liveusb/creator.py:142
+#: ../tails_installer/creator.py:142
msgid "Verifying ISO MD5 checksum"
msgstr ""
-#: ../liveusb/creator.py:147
+#: ../tails_installer/creator.py:147
msgid "ISO MD5 checksum verification failed"
msgstr ""
-#: ../liveusb/creator.py:149
+#: ../tails_installer/creator.py:149
msgid "ISO MD5 checksum passed"
msgstr ""
-#: ../liveusb/creator.py:154
+#: ../tails_installer/creator.py:154
msgid "Extracting live image to the target device..."
msgstr ""
-#: ../liveusb/creator.py:161
+#: ../tails_installer/creator.py:161
#, python-format
msgid "Wrote to device at %(speed)d MB/sec"
msgstr ""
-#: ../liveusb/creator.py:191
+#: ../tails_installer/creator.py:191
msgid "Setting up OLPC boot file..."
msgstr ""
-#: ../liveusb/creator.py:338
+#: ../tails_installer/creator.py:338
#, python-format
msgid ""
"There was a problem executing the following command: `%(command)s`.\n"
"A more detailed error log has been written to '%(filename)s'."
msgstr ""
-#: ../liveusb/creator.py:357
+#: ../tails_installer/creator.py:357
msgid "Verifying SHA1 checksum of LiveCD image..."
msgstr ""
-#: ../liveusb/creator.py:361
+#: ../tails_installer/creator.py:361
msgid "Verifying SHA256 checksum of LiveCD image..."
msgstr ""
-#: ../liveusb/creator.py:377
+#: ../tails_installer/creator.py:377
msgid ""
"Error: The SHA1 of your Live CD is invalid. You can run this program with "
"the --noverify argument to bypass this verification check."
msgstr ""
-#: ../liveusb/creator.py:383
+#: ../tails_installer/creator.py:383
msgid "Unknown ISO, skipping checksum verification"
msgstr ""
-#: ../liveusb/creator.py:394
+#: ../tails_installer/creator.py:394
#, python-format
msgid ""
"Not enough free space on device.\n"
"%dMB ISO + %dMB overlay > %dMB free space"
msgstr ""
-#: ../liveusb/creator.py:401
+#: ../tails_installer/creator.py:401
#, python-format
msgid "Creating %sMB persistent overlay"
msgstr ""
-#: ../liveusb/creator.py:462
+#: ../tails_installer/creator.py:462
#, python-format
msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s"
msgstr ""
-#: ../liveusb/creator.py:476
+#: ../tails_installer/creator.py:476
msgid "Removing existing Live OS"
msgstr ""
-#: ../liveusb/creator.py:485 ../liveusb/creator.py:496
+#: ../tails_installer/creator.py:485 ../tails_installer/creator.py:496
#, python-format
msgid "Unable to chmod %(file)s: %(message)s"
msgstr ""
-#: ../liveusb/creator.py:489
+#: ../tails_installer/creator.py:489
#, python-format
msgid "Unable to remove file from previous LiveOS: %(message)s"
msgstr ""
-#: ../liveusb/creator.py:501
+#: ../tails_installer/creator.py:501
#, python-format
msgid "Unable to remove directory from previous LiveOS: %(message)s"
msgstr ""
-#: ../liveusb/creator.py:554
+#: ../tails_installer/creator.py:554
#, python-format
msgid "Cannot find device %s"
msgstr ""
-#: ../liveusb/creator.py:617
+#: ../tails_installer/creator.py:617
msgid ""
"You are using an old version of syslinux-extlinux that does not support the "
"ext4 filesystem"
msgstr ""
-#: ../liveusb/creator.py:720
+#: ../tails_installer/creator.py:720
#, python-format
msgid "Unable to write on %(device)s, skipping."
msgstr ""
-#: ../liveusb/creator.py:739
+#: ../tails_installer/creator.py:739
#, python-format
msgid ""
"Some partitions of the target device %(device)s are mounted. They will be "
"unmounted before starting the installation process."
msgstr ""
-#: ../liveusb/creator.py:782 ../liveusb/creator.py:1005
+#: ../tails_installer/creator.py:782 ../tails_installer/creator.py:1005
msgid "Unknown filesystem. Your device may need to be reformatted."
msgstr ""
-#: ../liveusb/creator.py:785 ../liveusb/creator.py:1008
+#: ../tails_installer/creator.py:785 ../tails_installer/creator.py:1008
#, python-format
msgid "Unsupported filesystem: %s"
msgstr ""
-#: ../liveusb/creator.py:802
+#: ../tails_installer/creator.py:802
#, python-format
msgid "Unknown GLib exception while trying to mount device: %(message)s"
msgstr ""
-#: ../liveusb/creator.py:806
+#: ../tails_installer/creator.py:806
#, python-format
msgid "Unable to mount device: %(message)s"
msgstr ""
-#: ../liveusb/creator.py:811
+#: ../tails_installer/creator.py:811
msgid "No mount points found"
msgstr ""
-#: ../liveusb/creator.py:822
+#: ../tails_installer/creator.py:822
#, python-format
msgid "Entering unmount_device for '%(device)s'"
msgstr ""
-#: ../liveusb/creator.py:832
+#: ../tails_installer/creator.py:832
#, python-format
msgid "Unmounting mounted filesystems on '%(device)s'"
msgstr ""
-#: ../liveusb/creator.py:836
+#: ../tails_installer/creator.py:836
#, python-format
msgid "Unmounting '%(udi)s' on '%(device)s'"
msgstr ""
-#: ../liveusb/creator.py:846
+#: ../tails_installer/creator.py:846
#, python-format
msgid "Mount %s exists after unmounting"
msgstr ""
-#: ../liveusb/creator.py:859
+#: ../tails_installer/creator.py:859
#, python-format
msgid "Partitioning device %(device)s"
msgstr ""
-#: ../liveusb/creator.py:940
+#: ../tails_installer/creator.py:940
#, python-format
msgid "Updating properties of system partition %(system_partition)s"
msgstr ""
-#: ../liveusb/creator.py:990
+#: ../tails_installer/creator.py:990
#, python-format
msgid "Unsupported device '%(device)s', please report a bug."
msgstr ""
-#: ../liveusb/creator.py:993
+#: ../tails_installer/creator.py:993
msgid "Trying to continue anyway."
msgstr ""
-#: ../liveusb/creator.py:1002 ../liveusb/creator.py:1404
+#: ../tails_installer/creator.py:1002 ../tails_installer/creator.py:1404
msgid "Verifying filesystem..."
msgstr ""
-#: ../liveusb/creator.py:1026
+#: ../tails_installer/creator.py:1026
#, python-format
msgid "Unable to change volume label: %(message)s"
msgstr ""
-#: ../liveusb/creator.py:1031 ../liveusb/creator.py:1437
+#: ../tails_installer/creator.py:1031 ../tails_installer/creator.py:1437
msgid "Installing bootloader..."
msgstr ""
-#: ../liveusb/creator.py:1056
+#: ../tails_installer/creator.py:1056
#, python-format
msgid "Could not find the '%s' COM32 module"
msgstr ""
-#: ../liveusb/creator.py:1064 ../liveusb/creator.py:1455
+#: ../tails_installer/creator.py:1064 ../tails_installer/creator.py:1455
#, python-format
msgid "Removing %(file)s"
msgstr ""
-#: ../liveusb/creator.py:1175
+#: ../tails_installer/creator.py:1175
#, python-format
msgid "%s already bootable"
msgstr ""
-#: ../liveusb/creator.py:1195
+#: ../tails_installer/creator.py:1195
msgid "Unable to find partition"
msgstr ""
-#: ../liveusb/creator.py:1218
+#: ../tails_installer/creator.py:1218
#, python-format
msgid "Formatting %(device)s as FAT32"
msgstr ""
-#: ../liveusb/creator.py:1277
+#: ../tails_installer/creator.py:1277
msgid "Could not find syslinux' gptmbr.bin"
msgstr ""
-#: ../liveusb/creator.py:1290
+#: ../tails_installer/creator.py:1290
#, python-format
msgid "Reading extracted MBR from %s"
msgstr ""
-#: ../liveusb/creator.py:1294
+#: ../tails_installer/creator.py:1294
#, python-format
msgid "Could not read the extracted MBR from %(path)s"
msgstr ""
-#: ../liveusb/creator.py:1307 ../liveusb/creator.py:1308
+#: ../tails_installer/creator.py:1307 ../tails_installer/creator.py:1308
#, python-format
msgid "Resetting Master Boot Record of %s"
msgstr ""
-#: ../liveusb/creator.py:1313
+#: ../tails_installer/creator.py:1313
msgid "Drive is a loopback, skipping MBR reset"
msgstr ""
-#: ../liveusb/creator.py:1317 ../liveusb/creator.py:1583
+#: ../tails_installer/creator.py:1317 ../tails_installer/creator.py:1583
#, python-format
msgid "Calculating the SHA1 of %s"
msgstr ""
-#: ../liveusb/creator.py:1342
+#: ../tails_installer/creator.py:1342
msgid "Synchronizing data on disk..."
msgstr ""
-#: ../liveusb/creator.py:1396
+#: ../tails_installer/creator.py:1396
msgid "Error probing device"
msgstr ""
-#: ../liveusb/creator.py:1398
+#: ../tails_installer/creator.py:1398
msgid "Unable to find any supported device"
msgstr ""
-#: ../liveusb/creator.py:1408
+#: ../tails_installer/creator.py:1408
msgid ""
"Make sure your USB key is plugged in and formatted with the FAT filesystem"
msgstr ""
-#: ../liveusb/creator.py:1411
+#: ../tails_installer/creator.py:1411
#, python-format
msgid ""
"Unsupported filesystem: %s\n"
"Please backup and format your USB key with the FAT filesystem."
msgstr ""
-#: ../liveusb/creator.py:1478
+#: ../tails_installer/creator.py:1478
msgid ""
"Unable to get Win32_LogicalDisk; win32com query did not return any results"
msgstr ""
-#: ../liveusb/creator.py:1531
+#: ../tails_installer/creator.py:1531
msgid "Cannot find"
msgstr ""
-#: ../liveusb/creator.py:1532
+#: ../tails_installer/creator.py:1532
msgid ""
-"Make sure to extract the entire liveusb-creator zip file before running this "
+"Make sure to extract the entire tails-installer zip file before running this "
"program."
msgstr ""
-#: ../liveusb/gui.py:73
+#: ../tails_installer/gui.py:73
#, python-format
msgid "Unknown release: %s"
msgstr ""
-#: ../liveusb/gui.py:77
+#: ../tails_installer/gui.py:77
#, python-format
msgid "Downloading %s..."
msgstr ""
-#: ../liveusb/gui.py:209
+#: ../tails_installer/gui.py:209
msgid ""
"Error: Cannot set the label or obtain the UUID of your device. Unable to "
"continue."
msgstr ""
-#: ../liveusb/gui.py:264
+#: ../tails_installer/gui.py:264
#, python-format
msgid "Installation complete! (%s)"
msgstr ""
-#: ../liveusb/gui.py:269
-msgid "LiveUSB creation failed!"
+#: ../tails_installer/gui.py:269
+msgid "Tails installation failed!"
msgstr ""
-#: ../liveusb/gui.py:364
+#: ../tails_installer/gui.py:364
msgid ""
"Warning: This tool needs to be run as an Administrator. To do this, right "
"click on the icon and open the Properties. Under the Compatibility tab, "
"check the \"Run this program as an administrator\" box."
msgstr ""
-#: ../liveusb/gui.py:376 ../liveusb/launcher.py:31
+#: ../tails_installer/gui.py:376 ../tails_installer/launcher.py:31
msgid "Tails Installer"
msgstr ""
-#: ../liveusb/gui.py:451
+#: ../tails_installer/gui.py:451
msgid "No device suitable to install Tails could be found"
msgstr ""
-#: ../liveusb/gui.py:453
+#: ../tails_installer/gui.py:453
#, python-format
msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
msgstr ""
-#: ../liveusb/gui.py:485
+#: ../tails_installer/gui.py:485
#, python-format
msgid "%(size)s %(label)s"
msgstr ""
-#: ../liveusb/gui.py:491
+#: ../tails_installer/gui.py:491
#, python-format
msgid "%(vendor)s %(model)s (%(details)s) - %(device)s"
msgstr ""
-#: ../liveusb/gui.py:499
+#: ../tails_installer/gui.py:499
#, python-format
msgid ""
"The device \"%(pretty_name)s\" is too small to install Tails (at least "
"%(size)s GB is required)."
msgstr ""
-#: ../liveusb/gui.py:512
+#: ../tails_installer/gui.py:512
msgid "\"Clone & Install\""
msgstr ""
-#: ../liveusb/gui.py:514
+#: ../tails_installer/gui.py:514
msgid "\"Install from ISO\""
msgstr ""
-#: ../liveusb/gui.py:515
+#: ../tails_installer/gui.py:515
#, python-format
msgid ""
"It is impossible to upgrade the device %(pretty_name)s because it was not "
@@ -378,42 +378,42 @@ msgid ""
"Tails on this device."
msgstr ""
-#: ../liveusb/gui.py:534
+#: ../tails_installer/gui.py:534
msgid "An error happened while installing Tails"
msgstr ""
-#: ../liveusb/gui.py:546
+#: ../tails_installer/gui.py:546
msgid "Refreshing releases..."
msgstr ""
-#: ../liveusb/gui.py:551
+#: ../tails_installer/gui.py:551
msgid "Releases updated!"
msgstr ""
-#: ../liveusb/gui.py:590
+#: ../tails_installer/gui.py:590
msgid "Installation complete!"
msgstr ""
-#: ../liveusb/gui.py:591
+#: ../tails_installer/gui.py:591
msgid "Installation was completed. Press OK to close this program."
msgstr ""
-#: ../liveusb/gui.py:637
+#: ../tails_installer/gui.py:637
msgid "Unable to mount device"
msgstr ""
-#: ../liveusb/gui.py:644 ../liveusb/gui.py:672
+#: ../tails_installer/gui.py:644 ../tails_installer/gui.py:672
msgid "Please confirm your device selection"
msgstr ""
-#: ../liveusb/gui.py:645
+#: ../tails_installer/gui.py:645
#, python-format
msgid ""
"You are going to install Tails on the %(size)s %(vendor)s %(model)s device "
"(%(device)s). All data on the selected device will be lost. Continue?"
msgstr ""
-#: ../liveusb/gui.py:662
+#: ../tails_installer/gui.py:662
#, python-format
msgid ""
"You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s "
@@ -421,230 +421,233 @@ msgid ""
"unchanged. Continue?"
msgstr ""
-#: ../liveusb/gui.py:718
+#: ../tails_installer/gui.py:718
msgid "Download complete!"
msgstr ""
-#: ../liveusb/gui.py:722
+#: ../tails_installer/gui.py:722
msgid "Download failed: "
msgstr ""
-#: ../liveusb/gui.py:723
+#: ../tails_installer/gui.py:723
msgid "You can try again to resume your download"
msgstr ""
-#: ../liveusb/gui.py:731
+#: ../tails_installer/gui.py:731
msgid ""
"The selected file is unreadable. Please fix its permissions or select "
"another file."
msgstr ""
-#: ../liveusb/gui.py:737
+#: ../tails_installer/gui.py:737
msgid ""
"Unable to use the selected file. You may have better luck if you move your "
"ISO to the root of your drive (ie: C:\\)"
msgstr ""
-#: ../liveusb/gui.py:743
+#: ../tails_installer/gui.py:743
#, python-format
msgid "%(filename)s selected"
msgstr ""
-#: ../liveusb/source.py:35
+#: ../tails_installer/source.py:35
msgid "Unable to find LiveOS on ISO"
msgstr ""
-#: ../liveusb/source.py:41
+#: ../tails_installer/source.py:41
#, python-format
msgid "Could not guess underlying block device: %s"
msgstr ""
-#: ../liveusb/source.py:52 ../liveusb/utils.py:44
+#: ../tails_installer/source.py:52 ../tails_installer/utils.py:44
#, python-format
msgid ""
"There was a problem executing `%s`.%s\n"
"%s"
msgstr ""
-#: ../liveusb/source.py:75
+#: ../tails_installer/source.py:75
#, python-format
msgid ""
"ISO MD5 checksum verification failed:%s\n"
"%s"
msgstr ""
-#: ../liveusb/source.py:82
+#: ../tails_installer/source.py:82
#, python-format
msgid "'%s' does not exist"
msgstr ""
-#: ../liveusb/source.py:84
+#: ../tails_installer/source.py:84
#, python-format
msgid "'%s' is not a directory"
msgstr ""
-#: ../liveusb/source.py:94
+#: ../tails_installer/source.py:94
#, python-format
msgid "Skipping '%(filename)s'"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:693 ../liveusb/urlgrabber/grabber.py:1172
+#: ../tails_installer/urlgrabber/grabber.py:693
+#: ../tails_installer/urlgrabber/grabber.py:1172
#, python-format
msgid "Bad URL: %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:781
+#: ../tails_installer/urlgrabber/grabber.py:781
#, python-format
msgid "Illegal reget mode: %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:906
+#: ../tails_installer/urlgrabber/grabber.py:906
#, python-format
msgid "Local file does not exist: %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:909
+#: ../tails_installer/urlgrabber/grabber.py:909
#, python-format
msgid "Not a normal file: %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:967
+#: ../tails_installer/urlgrabber/grabber.py:967
#, python-format
msgid "Exceeded limit (%i): %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:1150
+#: ../tails_installer/urlgrabber/grabber.py:1150
msgid "Byte range requested but range support unavailable"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:1183 ../liveusb/urlgrabber/grabber.py:1262
+#: ../tails_installer/urlgrabber/grabber.py:1183
+#: ../tails_installer/urlgrabber/grabber.py:1262
#, python-format
msgid "Timeout: %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:1185 ../liveusb/urlgrabber/grabber.py:1264
+#: ../tails_installer/urlgrabber/grabber.py:1185
+#: ../tails_installer/urlgrabber/grabber.py:1264
#, python-format
msgid "IOError: %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:1187
+#: ../tails_installer/urlgrabber/grabber.py:1187
#, python-format
msgid "OSError: %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:1189
+#: ../tails_installer/urlgrabber/grabber.py:1189
#, python-format
msgid "HTTP Exception (%s): %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:1260
+#: ../tails_installer/urlgrabber/grabber.py:1260
#, python-format
msgid "Socket Error: %s"
msgstr ""
-#: ../liveusb/urlgrabber/grabber.py:1332
+#: ../tails_installer/urlgrabber/grabber.py:1332
#, python-format
msgid "Bad proxy URL: %s"
msgstr ""
-#: ../liveusb/urlgrabber/mirror.py:287
+#: ../tails_installer/urlgrabber/mirror.py:287
msgid "No more mirrors to try."
msgstr ""
-#: ../liveusb/utils.py:119
+#: ../tails_installer/utils.py:119
msgid "Could not open device for writing."
msgstr ""
-#: ../data/liveusb-creator.ui.h:1
+#: ../data/tails-installer.ui.h:1
msgid "Use existing Live system ISO:"
msgstr ""
-#: ../data/liveusb-creator.ui.h:2
+#: ../data/tails-installer.ui.h:2
msgid "Select a distribution to download:"
msgstr ""
-#: ../data/liveusb-creator.ui.h:3
+#: ../data/tails-installer.ui.h:3
msgid "Target Device:"
msgstr ""
-#: ../data/liveusb-creator.ui.h:4
+#: ../data/tails-installer.ui.h:4
msgid "Install Tails"
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:1
+#: ../data/tails-installer-launcher.ui.h:1
msgid ""
"To run Tails Installer you need an ISO image which can be downloaded from "
"the Tails website: <a href=\"https://tails.boum.org/download/\">https://"
"tails.boum.org/download/</a>"
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:2
+#: ../data/tails-installer-launcher.ui.h:2
msgid "Install"
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:3
+#: ../data/tails-installer-launcher.ui.h:3
msgid "• Install Tails on a new USB stick."
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:4
+#: ../data/tails-installer-launcher.ui.h:4
msgid "• The USB stick that you install on is formatted and all data is lost."
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:5
+#: ../data/tails-installer-launcher.ui.h:5
msgid "Upgrade"
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:6
+#: ../data/tails-installer-launcher.ui.h:6
msgid "• Upgrade a Tails USB stick to the version of an ISO image."
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:7
+#: ../data/tails-installer-launcher.ui.h:7
msgid ""
"• The encrypted persistent storage of the Tails USB stick that you upgrade "
"is preserved."
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:8
+#: ../data/tails-installer-launcher.ui.h:8
msgid ""
"Need help? Read the <a href=\"https://tails.boum.org/doc/first_steps/"
"installation/\">documentation</a>"
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:9
+#: ../data/tails-installer-launcher.ui.h:9
msgid "Install by cloning"
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:10
+#: ../data/tails-installer-launcher.ui.h:10
msgid ""
"• Install Tails on another USB stick by copying the Tails system that you "
"are currently using."
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:11
+#: ../data/tails-installer-launcher.ui.h:11
msgid ""
"• The encrypted persistent storage of the Tails USB stick that you are "
"currently using is not copied."
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:12
+#: ../data/tails-installer-launcher.ui.h:12
msgid "Upgrade by cloning"
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:13
+#: ../data/tails-installer-launcher.ui.h:13
msgid ""
"• Upgrade another Tails USB stick to the same version of Tails that you are "
"currently using."
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:14
+#: ../data/tails-installer-launcher.ui.h:14
msgid "Upgrade from ISO"
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:15
+#: ../data/tails-installer-launcher.ui.h:15
msgid "• Upgrade another Tails USB stick to the version of an ISO image."
msgstr ""
-#: ../data/liveusb-creator-launcher.ui.h:16
+#: ../data/tails-installer-launcher.ui.h:16
msgid ""
"Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/"
"first_steps/installation.en.html\">documentation</a>"
diff --git a/release.bat b/release.bat
index ba8648d..adc8fe3 100644
--- a/release.bat
+++ b/release.bat
@@ -1,24 +1,24 @@
-:: Generate a new Windows liveusb-creator release
+:: Generate a new Windows tails-installer release
:: Usage: `release 3.0.1`
:: Author: Luke Macken <lmacken@redhat.com>
-echo Generating an exe of the liveusb-creator %1
+echo Generating an exe of the tails-installer %1
rmdir /S /Q dist
rmdir /S /Q build
-rmdir /S /Q liveusb-creator-%1
+rmdir /S /Q tails-installer-%1
cd po
rmdir /S /Q locale
for %%f in (*.po) do (
mkdir locale\%%~Nf\LC_MESSAGES
- python C:\Python27\Tools\i18n\msgfmt.py -o locale\%%~Nf\LC_MESSAGES\liveusb-creator.mo %%f
+ python C:\Python27\Tools\i18n\msgfmt.py -o locale\%%~Nf\LC_MESSAGES\tails-installer.mo %%f
)
cd ..
python -OO setup.py py2exe
copy README.txt dist
-copy data\fedora.ico dist\liveusb-creator.ico
+copy data\fedora.ico dist\tails-installer.ico
copy data\vcredist_x86.exe dist\
-copy data\liveusb-creator.nsi dist\liveusb-creator.nsi
-"C:\Program Files\NSIS\makensis.exe" dist\liveusb-creator.nsi
-rename dist liveusb-creator-%1
+copy data\tails-installer.nsi dist\tails-installer.nsi
+"C:\Program Files\NSIS\makensis.exe" dist\tails-installer.nsi
+rename dist tails-installer-%1
diff --git a/setup.py b/setup.py
index c009d06..7c90b93 100755
--- a/setup.py
+++ b/setup.py
@@ -43,20 +43,20 @@ if sys.platform == 'win32':
LOCALE_DIR = 'locale'
setup(
- name = 'liveusb-creator',
+ name = 'tails-installer',
version = VERSION,
- packages = ['liveusb', 'liveusb/urlgrabber'],
- scripts = ['liveusb-creator'],
+ packages = ['tails_installer', 'tails_installer/urlgrabber'],
+ scripts = ['tails-installer'],
license = 'GNU General Public License (GPL)',
- url = 'https://fedorahosted.org/liveusb-creator',
+ url = 'https://tails.boum.org/tails-installer',
description = 'This tool installs a LiveCD ISO on to a USB stick',
- long_description = 'The liveusb-creator is a cross-platform tool for easily installing live operating systems on to USB flash drives',
+ long_description = 'The tails-installer is a cross-platform tool for easily installing live operating systems on to USB flash drives',
platforms = ['Windows'],
maintainer = 'Luke Macken',
maintainer_email = 'lmacken@redhat.com',
windows = [
{
- "script" : "liveusb-creator",
+ "script" : "tails-installer",
# "icon_resources" : [(0, "data/fedora.ico")],
}
],
@@ -81,7 +81,7 @@ if sys.platform == 'win32':
"tools/7-Zip-License.txt",
],)
] + [(os.path.join(LOCALE_DIR, locale),
- [os.path.join('po', 'locale', locale, 'liveusb-creator.mo')])
+ [os.path.join('po', 'locale', locale, 'tails-installer.mo')])
for locale in locales]
)
else:
@@ -96,30 +96,30 @@ else:
def run(self):
subprocess.call (["intltool-extract",
"--type=gettext/glade",
- "data/liveusb-creator.ui"])
+ "data/tails-installer.ui"])
subprocess.call (["intltool-extract",
"--type=gettext/glade",
- "data/liveusb-creator-launcher.ui"])
+ "data/tails-installer-launcher.ui"])
build_extra.build_extra.sub_commands.insert(0, ("build_gtkbuilderi18n", None))
setup(
- name = 'liveusb-creator',
+ name = 'tails-installer',
version = VERSION,
- packages = ['liveusb'],
- scripts = ['liveusb-creator', 'liveusb-creator-launcher'],
+ packages = ['tails_installer'],
+ scripts = ['tails-installer', 'tails-installer-launcher'],
license = 'GNU General Public License (GPL)',
- url = 'https://fedorahosted.org/liveusb-creator',
+ url = 'https://fedorahosted.org/tails-installer',
description = 'This tool installs a LiveCD ISO on to a USB stick',
- long_description = 'The liveusb-creator is a cross-platform tool for easily installing live operating systems on to USB flash drives',
+ long_description = 'The tails-installer is a cross-platform tool for easily installing live operating systems on to USB flash drives',
platforms = ['Linux'],
maintainer = 'Luke Macken',
maintainer_email = 'lmacken@redhat.com',
data_files = [("/usr/share/applications",
- [ "data/liveusb-creator-launcher.desktop" ]),
+ [ "data/tails-installer-launcher.desktop" ]),
("/usr/share/pixmaps",["data/usb-creator-gtk.svg"]),
- ("/usr/share/liveusb-creator", ["data/liveusb-creator.ui",
- "data/liveusb-creator-launcher.ui",
+ ("/usr/share/tails-installer", ["data/tails-installer.ui",
+ "data/tails-installer-launcher.ui",
"data/tails-liveusb-header.png"])],
cmdclass = {
"build" : build_extra.build_extra,
diff --git a/liveusb-creator b/tails-installer
index d594e0c..b14a21f 100755
--- a/liveusb-creator
+++ b/tails-installer
@@ -23,7 +23,7 @@
import os
import sys
-from liveusb import _
+from tails_installer import _
__version__ = '3.11.8'
@@ -78,9 +78,9 @@ def parse_args():
def main():
opts, args = parse_args()
if opts.console:
- from liveusb import LiveUSBCreator
+ from tails_installer import TailsInstallerCreator
try:
- live = LiveUSBCreator(opts)
+ live = TailsInstallerCreator(opts)
live.detect_supported_drives()
live.verify_filesystem()
live.extract_iso()
@@ -92,9 +92,9 @@ def main():
else:
## Start our graphical interface
from gi.repository import Gtk
- from liveusb.gui import LiveUSBWindow
+ from tails_installer.gui import TailsInstallerWindow
try:
- win = LiveUSBWindow(opts=opts, args=sys.argv)
+ win = TailsInstallerWindow(opts=opts, args=sys.argv)
Gtk.main()
except KeyboardInterrupt:
pass
diff --git a/liveusb-creator-launcher b/tails-installer-launcher
index 5d4b23d..8c98db5 100755
--- a/liveusb-creator-launcher
+++ b/tails-installer-launcher
@@ -17,7 +17,7 @@ import sys
from gi.repository import Gtk
-from liveusb.launcher import LiveUSBLauncherWindow
+from tails_installer.launcher import TailsInstallerLauncherWindow
def main():
try:
@@ -25,7 +25,7 @@ def main():
args = sys.argv[1:]
else:
args = []
- LiveUSBLauncherWindow(args)
+ TailsInstallerLauncherWindow(args)
Gtk.main()
except KeyboardInterrupt:
pass
diff --git a/liveusb-creator-launcher.1.markdown b/tails-installer-launcher.1.markdown
index 300ffdc..b8b3df6 100644
--- a/liveusb-creator-launcher.1.markdown
+++ b/tails-installer-launcher.1.markdown
@@ -1,22 +1,22 @@
-% LIVEUSB-CREATOR-LAUNCHER(1) liveusb-creator-launcher user manual
+% tails-installer-LAUNCHER(1) tails-installer-launcher user manual
% This manual page was written by u <u@451f.org>
% July 22nd, 2015
NAME
====
-liveusb-creator-launcher - launches Tails Installer
+tails-installer-launcher - launches Tails Installer
SYNOPSIS
========
- liveusb-creator-launcher
+ tails-installer-launcher
DESCRIPTION
===========
-liveusb-creator-launcher is a graphical frontend that hides the
-complexity of running liveusb-creator with the right set of options.
+tails-installer-launcher is a graphical frontend that hides the
+complexity of running tails-installer with the right set of options.
It lets the user choose among a limited number of installation and
upgrade options; only the options that make sense in the current
runtime context are made available.
diff --git a/liveusb-creator.1.markdown b/tails-installer.1.markdown
index 98224d8..971d57a 100644
--- a/liveusb-creator.1.markdown
+++ b/tails-installer.1.markdown
@@ -1,16 +1,16 @@
-% LIVEUSB-CREATOR(1) liveusb-creator user manual
+% tails-installer(1) tails-installer user manual
% This manual page was written by intrigeri <intrigeri@boum.org>
% February 2, 2012
NAME
====
-liveusb-creator - installs a LiveCD ISO onto a USB stick
+tails-installer - installs a LiveCD ISO onto a USB stick
SYNOPSIS
========
- liveusb-creator [OPTIONS] [FILE]
+ tails-installer [OPTIONS] [FILE]
OPTIONS
=======
diff --git a/liveusb-creator.console b/tails-installer.console
index 52b46e0..cd835b9 100644
--- a/liveusb-creator.console
+++ b/tails-installer.console
@@ -1,5 +1,5 @@
USER=root
-PROGRAM=/usr/sbin/liveusb-creator
+PROGRAM=/usr/sbin/tails-installer
SESSION=true
FALLBACK=true
diff --git a/liveusb-creator.pam b/tails-installer.pam
index df41b4c..df41b4c 100644
--- a/liveusb-creator.pam
+++ b/tails-installer.pam
diff --git a/liveusb/__init__.py b/tails_installer/__init__.py
index c6c0f9c..8d6d348 100644
--- a/liveusb/__init__.py
+++ b/tails_installer/__init__.py
@@ -34,9 +34,9 @@ if os.path.exists('/usr/sbin') or os.path.exists('/usr/local/sbin'):
os.environ['PATH'] = '/usr/local/sbin:/usr/sbin'
if os.path.exists('po/locale'):
- translation = gettext.translation('liveusb-creator', 'po/locale', fallback=True)
+ translation = gettext.translation('tails-installer', 'po/locale', fallback=True)
else:
- translation = gettext.translation('liveusb-creator', '/usr/share/locale',
+ translation = gettext.translation('tails-installer', '/usr/share/locale',
fallback=True)
_ = translation.ugettext
@@ -44,17 +44,17 @@ def utf8_gettext(string):
" Translate string, converting it to a UTF-8 encoded bytestring "
return _(string).encode('utf8')
-from liveusb.creator import LiveUSBError
+from tails_installer.creator import TailsInstallerError
if sys.platform == "win32":
- from liveusb.creator import WindowsLiveUSBCreator as LiveUSBCreator
+ from tails_installer.creator import WindowsTailsInstallerCreator as TailsInstallerCreator
else:
- from liveusb.creator import LinuxLiveUSBCreator as LiveUSBCreator
+ from tails_installer.creator import LinuxTailsInstallerCreator as TailsInstallerCreator
-from liveusb.config import config
+from tails_installer.config import config
branding = {
'distribution': config['branding']['distribution'],
'header': config['branding']['header']
}
-__all__ = ("LiveUSBCreator", "LiveUSBError", "LiveUSBDialog", "_", "utf8_gettext", "branding")
+__all__ = ("TailsInstallerCreator", "TailsInstallerError", "TailsInstallerDialog", "_", "utf8_gettext", "branding")
diff --git a/liveusb/config.py b/tails_installer/config.py
index 6c0fc12..29f6725 100644
--- a/liveusb/config.py
+++ b/tails_installer/config.py
@@ -4,7 +4,7 @@ import os
from configobj import ConfigObj
-config_files = [ os.path.join('/', 'etc', 'liveusb-creator', f )
+config_files = [ os.path.join('/', 'etc', 'tails-installer', f )
for f in [ 'defaults.ini', 'vendor.ini', 'site.ini' ] ]
# XXX: move defaults to a proper defaults.ini file?
diff --git a/liveusb/creator.py b/tails_installer/creator.py
index 2916596..2e68f51 100755
--- a/liveusb/creator.py
+++ b/tails_installer/creator.py
@@ -17,11 +17,11 @@
# permission of Red Hat, Inc.
"""
-Our main LiveUSBCreator module.
+Our main Tails Installer module.
-This contains the LiveUSBCreator parent class, which is an abstract interface
-that provides platform-independent methods. Platform specific implementations
-include the LinuxLiveUSBCreator and the WindowsLiveUSBCreator.
+This contains the TailsInstallerCreator parent class, which is an abstract interface
+that provides platform-independent methods. Platform specific implementations
+include the LinuxTailsInstallerCreator and the WindowsTailsInstallerCreator.
"""
import subprocess
@@ -44,13 +44,13 @@ from pprint import pformat
if 'linux' in sys.platform:
from gi.repository import UDisks, GLib
-from liveusb.utils import (_move_if_exists, _unlink_if_exists, unicode_to_utf8,
+from tails_installer.utils import (_move_if_exists, _unlink_if_exists, unicode_to_utf8,
unicode_to_filesystemencoding, is_running_from_tails,
_set_liberal_perms_recursive, underlying_physical_device,
get_open_write_fd, write_to_block_device)
-from liveusb import _
-from liveusb.config import config
-from liveusb.source import SourceError
+from tails_installer import _
+from tails_installer.config import config
+from tails_installer.source import SourceError
#XXX: size should be configurable
SYSTEM_PARTITION_FLAGS = [ 0, # system partition
@@ -62,12 +62,12 @@ SYSTEM_PARTITION_FLAGS = [ 0, # system partition
# EFI System Partition
ESP_GUID = 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B'
-class LiveUSBError(Exception):
- """ A generic error message that is thrown by the LiveUSBCreator """
+class TailsInstallerError(Exception):
+ """ A generic error message that is thrown by the Tails Installer"""
-class LiveUSBCreator(object):
- """ An OS-independent parent class for Live USB Creators """
+class TailsInstallerCreator(object):
+ """ An OS-independent parent class for Tails Installer Creators """
system_partition_size = config['min_system_partition_size'] # MiB
min_persistence_partition_size = config['min_persistence_partition_size'] # MiB
@@ -102,7 +102,7 @@ class LiveUSBCreator(object):
def _setup_error_log_file(self):
temp = tempfile.NamedTemporaryFile(mode='a', delete=False,
- prefix='liveusb-creator-')
+ prefix='tails-installer-')
temp.close()
return temp.name
@@ -122,7 +122,7 @@ class LiveUSBCreator(object):
"""
Verify the filesystem of our device, setting the volume label
if necessary. If something is not right, this method throws a
- LiveUSBError.
+ TailsInstallerError.
"""
raise NotImplementedError
@@ -155,7 +155,7 @@ class LiveUSBCreator(object):
def install_bootloader(self):
""" Install the bootloader to our device.
- Platform-specific classes inheriting from the LiveUSBCreator are
+ Platform-specific classes inheriting from the TailsInstallerCreator are
expected to implement this method to install the bootloader to the
specified device using syslinux. This specific implemention is
platform independent and performs sanity checking along with adding
@@ -171,7 +171,7 @@ class LiveUSBCreator(object):
does this by installing a /boot/olpc.fth open firmware configuration
file that enables booting off of USB and SD cards on the XO.
"""
- from liveusb.olpc import ofw_config
+ from tails_installer.olpc import ofw_config
self.log.info(_('Setting up OLPC boot file...'))
args = self.get_kernel_args()
if not os.path.exists(self.get_liveos_file_path('boot')):
@@ -291,7 +291,7 @@ class LiveUSBCreator(object):
This method handles logging of the command and it's output, and keeps
track of the pids in case we need to kill them. If something goes
- wrong, an error log is written out and a LiveUSBError is thrown.
+ wrong, an error log is written out and a TailsInstallerError is thrown.
@param cmd: The commandline to execute. Either a string or a list.
@param passive: Enable passive process failure.
@@ -318,7 +318,7 @@ class LiveUSBCreator(object):
if proc.returncode:
self.write_log()
if not passive:
- raise LiveUSBError(_(
+ raise TailsInstallerError(_(
"There was a problem executing the following command: `%(command)s`.\nA more detailed error log has been written to '%(filename)s'.")
% {'command': cmd, 'filename': self._error_log_filename})
if ret == 'stdout':
@@ -375,7 +375,7 @@ class LiveUSBCreator(object):
self.log.debug('overlaysize = %d' % overlaysize)
self.totalsize = overlaysize + self.source.size
if self.totalsize > freebytes:
- raise LiveUSBError(_("Not enough free space on device." +
+ raise TailsInstallerError(_("Not enough free space on device." +
"\n%dMB ISO + %dMB overlay > %dMB free space") %
(self.source.size/1024**2, self.overlay,
freebytes/1024**2))
@@ -470,7 +470,7 @@ class LiveUSBCreator(object):
try:
os.unlink(path)
except:
- raise LiveUSBError(_("Unable to remove file from"
+ raise TailsInstallerError(_("Unable to remove file from"
" previous LiveOS: %(message)s")
% {'message': str(e)})
elif os.path.isdir(path):
@@ -482,7 +482,7 @@ class LiveUSBCreator(object):
try:
shutil.rmtree(path)
except OSError, e:
- raise LiveUSBError(_("Unable to remove directory from"
+ raise TailsInstallerError(_("Unable to remove directory from"
" previous LiveOS: %(message)s")
% {'message': str(e)})
@@ -500,7 +500,7 @@ class LiveUSBCreator(object):
def get_liveos_file_path(self, *args):
""" Given a path relative to the root of the Live OS filesystem,
returns the absolute path to it from the perspective of the system
- liveusb-creator is running on.
+ tails-installer is running on.
"""
return os.path.join(self.dest + os.path.sep, *args)
@@ -508,7 +508,7 @@ class LiveUSBCreator(object):
""" Returns the list of files install at top level in the Live
OS filesystem.
If absolute=True, return absolute paths from the perspective
- of the system liveusb-creator is running on; else, return paths
+ of the system tails-installer is running on; else, return paths
relative to the root of the Live OS filesystem.
"""
toplevels = config['liveos_toplevel_files']
@@ -526,16 +526,16 @@ class LiveUSBCreator(object):
def _set_drive(self, drive):
# XXX: sometimes fails with:
# Traceback (most recent call last):
- # File "liveusb-creator/git/liveusb/gui.py", line 200, in run
+ # File "tails-installer/git/tails_installer.gui.py", line 200, in run
# self.live.switch_drive_to_system_partition()
- # File "liveusb-creator/git/liveusb/creator.py", line 967, in switch_drive_to_system_partition
+ # File "tails-installer/git/tails_installer.creator.py", line 967, in switch_drive_to_system_partition
# self.drive = '%s%s' % (full_drive_name, append)
- # File "liveusb-creator/git/liveusb/creator.py", line 88, in <lambda>
+ # File "tails-installer/git/tails_installer.creator.py", line 88, in <lambda>
# fset=lambda self, d: self._set_drive(d))
- # File "liveusb-creator/git/liveusb/creator.py", line 553, in _set_drive
- # raise LiveUSBError(_("Cannot find device %s") % drive)
+ # File "tails-installer/git/tails_installer.creator.py", line 553, in _set_drive
+ # raise TailsInstallerError(_("Cannot find device %s") % drive)
if not self.drives.has_key(drive):
- raise LiveUSBError(_("Cannot find device %s") % drive)
+ raise TailsInstallerError(_("Cannot find device %s") % drive)
self.log.debug("%s selected: %s" % (drive, self.drives[drive]))
self._drive = drive
self.uuid = self.drives[drive]['uuid']
@@ -589,10 +589,10 @@ class LiveUSBCreator(object):
changes."""
raise NotImplementedError
-class LinuxLiveUSBCreator(LiveUSBCreator):
+class LinuxTailsInstallerCreator(TailsInstallerCreator):
def __init__(self, *args, **kw):
- super(LinuxLiveUSBCreator, self).__init__(*args, **kw)
+ super(LinuxTailsInstallerCreator, self).__init__(*args, **kw)
extlinux = self.get_extlinux_version()
if extlinux is None:
@@ -763,10 +763,10 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
def mount_device(self):
""" Mount our device if it is not already mounted """
if not self.fstype:
- raise LiveUSBError(_("Unknown filesystem. Your device "
+ raise TailsInstallerError(_("Unknown filesystem. Your device "
"may need to be reformatted."))
if self.fstype not in self.valid_fstypes:
- raise LiveUSBError(_("Unsupported filesystem: %s") %
+ raise TailsInstallerError(_("Unsupported filesystem: %s") %
self.fstype)
self.dest = self.drive['mount']
if not self.dest:
@@ -783,11 +783,11 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
if 'org.freedesktop.UDisks2.Error.AlreadyMounted' in e.message:
self.log.debug('Device already mounted')
else:
- raise LiveUSBError(_('Unknown GLib exception while trying to '
+ raise TailsInstallerError(_('Unknown GLib exception while trying to '
'mount device: %(message)s')
% {'message': str(e)})
except Exception, e:
- raise LiveUSBError(_("Unable to mount device: %(message)s")
+ raise TailsInstallerError(_("Unable to mount device: %(message)s")
% {'message': str(e)})
# Get the new mount point
@@ -909,7 +909,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
# http://cgit.freedesktop.org/udisks/tree/src/udiskslinuxpartitiontable.c?id=a66691c3#n630)
#
# XXX: this sometimes fails with:
- # liveusb/creator.py, line 940, in partition_device
+ # tails_installer.creator.py, line 940, in partition_device
# system_partition.call_set_type_sync(ESP_GUID,
# GLib.Variant('a{sv}', None))
# Error: udisks-error-quark:
@@ -986,10 +986,10 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
self.log.info(_("Verifying filesystem..."))
if self.fstype not in self.valid_fstypes:
if not self.fstype:
- raise LiveUSBError(_("Unknown filesystem. Your device "
+ raise TailsInstallerError(_("Unknown filesystem. Your device "
"may need to be reformatted."))
else:
- raise LiveUSBError(_("Unsupported filesystem: %s" %
+ raise TailsInstallerError(_("Unsupported filesystem: %s" %
self.fstype))
if self.drive['label'] != self.label:
self.log.info("Setting %(device)s label to %(label)s" %
@@ -1000,18 +1000,18 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
try:
self.popen('/sbin/dosfslabel %s %s' % (
self.drive['device'], self.label))
- except LiveUSBError:
+ except TailsInstallerError:
# dosfslabel returns an error code even upon success
pass
else:
self.popen('/sbin/e2label %s %s' % (self.drive['device'],
self.label))
- except LiveUSBError, e:
+ except TailsInstallerError, e:
self.log.error(_("Unable to change volume label: %(message)s") % {'message': str(e)})
def install_bootloader(self):
""" Run syslinux to install the bootloader on our devices """
- LiveUSBCreator.install_bootloader(self)
+ TailsInstallerCreator.install_bootloader(self)
self.log.info(_("Installing bootloader..."))
if not is_running_from_tails():
@@ -1037,7 +1037,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
copied = True
break
if not copied:
- raise LiveUSBError(_("Could not find the '%s' COM32 module")
+ raise TailsInstallerError(_("Could not find the '%s' COM32 module")
% com32mod)
# Don't prompt about overwriting files from mtools (#491234)
@@ -1151,7 +1151,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
import parted
try:
disk, partition = self.get_disk_partition()
- except LiveUSBError, e:
+ except TailsInstallerError, e:
self.log.exception(e)
return
if partition.isFlagAvailable(parted.PARTITION_BOOT):
@@ -1176,7 +1176,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
for part in disk.partitions:
if self._drive == "/dev/%s" %(part.getDeviceNodeName(),):
return disk, part
- raise LiveUSBError(_("Unable to find partition"))
+ raise TailsInstallerError(_("Unable to find partition"))
def initialize_zip_geometry(self):
""" This method initializes the selected device in a zip-like fashion.
@@ -1258,7 +1258,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
'/usr/share/syslinux/gptmbr.bin'):
if os.path.exists(mbr_bin):
return mbr_bin
- raise LiveUSBError(_("Could not find syslinux' gptmbr.bin"))
+ raise TailsInstallerError(_("Could not find syslinux' gptmbr.bin"))
def mbr_matches_syslinux_bin(self):
"""
@@ -1275,7 +1275,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
with open(mbr_path, 'rb') as mbr_fd:
self.extracted_mbr_content = mbr_fd.read()
if not len(self.extracted_mbr_content):
- raise LiveUSBError(_("Could not read the extracted MBR from %(path)s"
+ raise TailsInstallerError(_("Could not read the extracted MBR from %(path)s"
% {path: mbr_path}))
def reset_mbr(self):
@@ -1350,7 +1350,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
def connect_drive_monitor(self, callback, data=None):
self._udisksclient.connect('changed', callback, data)
-class WindowsLiveUSBCreator(LiveUSBCreator):
+class WindowsTailsInstallerCreator(TailsInstallerCreator):
def detect_supported_drives(self, callback=None):
import win32file, win32api, pywintypes
@@ -1379,7 +1379,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
self.log.exception(e)
self.log.error(_("Error probing device"))
if not len(self.drives):
- raise LiveUSBError(_("Unable to find any supported device"))
+ raise TailsInstallerError(_("Unable to find any supported device"))
if callback:
callback()
@@ -1389,10 +1389,10 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
try:
vol = win32api.GetVolumeInformation(self.drive['device'])
except Exception, e:
- raise LiveUSBError(_("Make sure your USB key is plugged in and "
+ raise TailsInstallerError(_("Make sure your USB key is plugged in and "
"formatted with the FAT filesystem"))
if vol[-1] not in ('FAT32', 'FAT'):
- raise LiveUSBError(_("Unsupported filesystem: %s\nPlease backup "
+ raise TailsInstallerError(_("Unsupported filesystem: %s\nPlease backup "
"and format your USB key with the FAT "
"filesystem." % vol[-1]))
self.fstype = 'vfat'
@@ -1417,13 +1417,13 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
def install_bootloader(self):
""" Run syslinux to install the bootloader on our device """
- LiveUSBCreator.install_bootloader(self)
+ TailsInstallerCreator.install_bootloader(self)
self.log.info(_("Installing bootloader..."))
device = self.drive['device']
syslinuxdir = os.path.join(device + os.path.sep, "syslinux")
if os.path.isdir(syslinuxdir):
# Python for Windows is unable to delete read-only files, and some
- # may exist here if the LiveUSB stick was created in Linux
+ # may exist here if the TailsInstaller stick was created in Linux
for f in os.listdir(syslinuxdir):
os.chmod(os.path.join(syslinuxdir, f), 0777)
shutil.rmtree(syslinuxdir)
@@ -1502,7 +1502,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
if isinstance(cmd, basestring):
cmd = cmd.split()
prgmfiles = os.getenv('PROGRAMFILES')
- folder = 'LiveUSB Creator'
+ folder = 'TailsInstaller Creator'
paths = [os.path.join(x, folder) for x in (prgmfiles, prgmfiles + ' (x86)')]
paths += [os.path.join(os.path.dirname(__file__), '..', '..'), '.']
tool = None
@@ -1512,11 +1512,11 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
tool = '"%s"' % exe
break
else:
- raise LiveUSBError(_("Cannot find") + ' %s. ' % (cmd[0]) +
+ raise TailsInstallerError(_("Cannot find") + ' %s. ' % (cmd[0]) +
_("Make sure to extract the entire "
- "liveusb-creator zip file before "
+ "tails-installer zip file before "
"running this program."))
- return LiveUSBCreator.popen(self, ' '.join([tool] + cmd[1:]),
+ return TailsInstallerCreator.popen(self, ' '.join([tool] + cmd[1:]),
creationflags=win32process.CREATE_NO_WINDOW,
**kwargs)
diff --git a/liveusb/gui.py b/tails_installer/gui.py
index b2b37bc..f6f8f41 100755
--- a/liveusb/gui.py
+++ b/tails_installer/gui.py
@@ -23,7 +23,7 @@
# Tails Developers <tails@boum.org>
"""
-A cross-platform graphical interface for the LiveUSBCreator
+A cross-platform graphical interface for the Tails Installer
"""
import os
@@ -38,16 +38,16 @@ from datetime import datetime
from gi.repository import Gdk, GLib, Gtk
-from liveusb import LiveUSBCreator, LiveUSBError, _
-from liveusb.config import config
-from liveusb.source import SourceError, LocalIsoSource
-from liveusb.source import RunningLiveSystemSource
-from liveusb.releases import releases, get_fedora_releases
-from liveusb.utils import _to_unicode, _format_bytes_in_gb, _get_datadir
-from liveusb.utils import is_running_from_tails
+from tails_installer import TailsInstallerCreator, TailsInstallerError, _
+from tails_installer.config import config
+from tails_installer.source import SourceError, LocalIsoSource
+from tails_installer.source import RunningLiveSystemSource
+from tails_installer.releases import releases, get_fedora_releases
+from tails_installer.utils import _to_unicode, _format_bytes_in_gb, _get_datadir
+from tails_installer.utils import is_running_from_tails
if sys.platform == 'win32':
- from liveusb.urlgrabber.grabber import URLGrabber, URLGrabError
- from liveusb.urlgrabber.progress import BaseMeter
+ from tails_installer.urlgrabber.grabber import URLGrabber, URLGrabError
+ from tails_installer.urlgrabber.progress import BaseMeter
else:
from urlgrabber.grabber import URLGrabber, URLGrabError
from urlgrabber.progress import BaseMeter
@@ -70,7 +70,7 @@ class ReleaseDownloader(threading.Thread):
self.url = rel['url']
break
else:
- raise LiveUSBError(_("Unknown release: %s") % release)
+ raise TailsInstallerError(_("Unknown release: %s") % release)
def run(self):
GLib.idle_add(self.parent.update_log,
@@ -158,7 +158,7 @@ class ProgressThread(threading.Thread):
GLib.idle_add(self.parent.progress, 1.0)
threading.Thread.__del__(self)
-class LiveUSBThread(threading.Thread):
+class TailsInstallerThread(threading.Thread):
def __init__(self, live, progress, parent):
threading.Thread.__init__(self)
@@ -187,7 +187,7 @@ class LiveUSBThread(threading.Thread):
GLib.idle_add(self.parent.on_installation_complete, None)
def run(self):
- self.handler = LiveUSBLogHandler(self.status)
+ self.handler = TailsInstallerLogHandler(self.status)
self.live.log.addHandler(self.handler)
self.now = datetime.now()
self.live.save_full_drive()
@@ -261,7 +261,7 @@ class LiveUSBThread(threading.Thread):
except Exception, e:
self.status(e.args[0])
- self.status(_("LiveUSB creation failed!"))
+ self.status(_("Tails installation failed!"))
self.live.log.exception(unicode(e))
self.live.log.debug(traceback.format_exc())
@@ -278,7 +278,7 @@ class LiveUSBThread(threading.Thread):
self.wait()
-class LiveUSBLogHandler(logging.Handler):
+class TailsInstallerLogHandler(logging.Handler):
def __init__(self, cb):
logging.Handler.__init__(self)
@@ -289,7 +289,7 @@ class LiveUSBLogHandler(logging.Handler):
self.cb(record.msg)
-class LiveUSBWindow(Gtk.ApplicationWindow):
+class TailsInstallerWindow(Gtk.ApplicationWindow):
""" Our main dialog class """
def __init__(self, app=None, opts=None, args=None):
@@ -325,7 +325,7 @@ class LiveUSBWindow(Gtk.ApplicationWindow):
# self.refreshDevicesButton.setFlat(True)
# self.refreshDevicesButton.setObjectName("refreshDevicesButton")
self.update_start_button()
- self.live = LiveUSBCreator(opts=opts)
+ self.live = TailsInstallerCreator(opts=opts)
if self.opts.clone:
self.live.source = RunningLiveSystemSource(
path=config['running_liveos_mountpoint'])
@@ -335,15 +335,15 @@ class LiveUSBWindow(Gtk.ApplicationWindow):
self.downloader = None
self.progress_thread = ProgressThread(parent=self)
self.download_progress = DownloadProgress(parent=self)
- self.live_thread = LiveUSBThread(live=self.live,
+ self.live_thread = TailsInstallerThread(live=self.live,
progress=self.progress_thread,
parent=self)
self.live.connect_drive_monitor(self.populate_devices)
self.confirmed = False
self.delete_existing_liveos_confirmed = False
- # Intercept all liveusb INFO log messages, and display them in the gui
- self.handler = LiveUSBLogHandler(lambda x: self.append_to_log(x))
+ # Intercept all tails_installer.INFO log messages, and display them in the gui
+ self.handler = TailsInstallerLogHandler(lambda x: self.append_to_log(x))
self.live.log.addHandler(self.handler)
if not self.opts.verbose:
self.live.log.removeHandler(self.live.handler)
@@ -372,7 +372,7 @@ class LiveUSBWindow(Gtk.ApplicationWindow):
# Import window content from UI file
builder = Gtk.Builder.new_from_file(
- os.path.join(_get_datadir(), 'liveusb-creator.ui'))
+ os.path.join(_get_datadir(), 'tails-installer.ui'))
self.__box_installer = builder.get_object('box_installer')
self.__image_header = builder.get_object('image_header')
self.__infobar = builder.get_object('infobar')
@@ -523,7 +523,7 @@ class LiveUSBWindow(Gtk.ApplicationWindow):
try:
self.live.detect_supported_drives(callback=add_devices)
- except LiveUSBError, e:
+ except TailsInstallerError, e:
self.__infobar.set_message_type(Gtk.MessageType.ERROR)
self.__label_infobar_title.set_text(
_("An error happened while installing Tails"))
@@ -605,7 +605,7 @@ class LiveUSBWindow(Gtk.ApplicationWindow):
return False
def begin(self):
- """ Begin the liveusb creation process.
+ """ Begin the Tails installation process.
This method is called when the "Install Tails" button is clicked.
"""
@@ -624,7 +624,7 @@ class LiveUSBWindow(Gtk.ApplicationWindow):
if not self.opts.partition:
try:
self.live.mount_device()
- except LiveUSBError, e:
+ except TailsInstallerError, e:
self.status(e.args[0])
self.enable_widgets(True)
return
@@ -671,7 +671,7 @@ class LiveUSBWindow(Gtk.ApplicationWindow):
self.delete_existing_liveos_confirmed = False
try:
self.live.delete_liveos()
- except LiveUSBError, e:
+ except TailsInstallerError, e:
self.status(e.args[0])
#self.live.unmount_device()
self.enable_widgets(True)
diff --git a/liveusb/launcher.py b/tails_installer/launcher.py
index fc716d9..e56525f 100644
--- a/liveusb/launcher.py
+++ b/tails_installer/launcher.py
@@ -3,17 +3,17 @@
# Copyright © 2012-2015, Tails developers <tails@boum.org>
"""
-A unified launcher for the most common LiveUSBCreator usecases
+A unified launcher for the most common Tails Installer usecases
"""
import os
from gi.repository import Gtk
-from liveusb import _
-from liveusb.utils import _get_datadir, is_running_from_tails
+from tails_installer import _
+from tails_installer.utils import _get_datadir, is_running_from_tails
-class LiveUSBLauncherWindow(Gtk.ApplicationWindow):
+class TailsInstallerLauncherWindow(Gtk.ApplicationWindow):
""" Our main dialog class """
def __init__(self, args):
@@ -25,7 +25,7 @@ class LiveUSBLauncherWindow(Gtk.ApplicationWindow):
self.connect('delete-event', Gtk.main_quit)
builder = Gtk.Builder.new_from_file(
- os.path.join(_get_datadir(), 'liveusb-creator-launcher.ui'))
+ os.path.join(_get_datadir(), 'tails-installer-launcher.ui'))
builder.connect_signals(self)
self.add(builder.get_object('box_launcher'))
self.set_title(_("Tails Installer"))
@@ -36,18 +36,18 @@ class LiveUSBLauncherWindow(Gtk.ApplicationWindow):
self.show()
- def run_live_usb_creator(self, args):
- args = ['liveusb-creator'] + args + self.args
- os.execvp('liveusb-creator', args)
+ def run_tails_installer(self, args):
+ args = ['tails-installer'] + args + self.args
+ os.execvp('tails-installer', args)
def on_clone_install(self, widget, data=None):
- self.run_live_usb_creator([ '-u', '-n', '--clone', '-P', '-m', '-x' ])
+ self.run_tails_installer([ '-u', '-n', '--clone', '-P', '-m', '-x' ])
def on_clone_upgrade(self, widget, data=None):
- self.run_live_usb_creator([ '-u', '-n', '-x', '--clone' ])
+ self.run_tails_installer([ '-u', '-n', '-x', '--clone' ])
def on_upgrade_iso(self, widget, data=None):
- self.run_live_usb_creator([ '-u', '-n', '-x' ])
+ self.run_tails_installer([ '-u', '-n', '-x' ])
def on_install_iso(self, widget, data=None):
- self.run_live_usb_creator([ '-u', '-n', '-P', '-m', '-x' ])
+ self.run_tails_installer([ '-u', '-n', '-P', '-m', '-x' ])
diff --git a/liveusb/olpc.py b/tails_installer/olpc.py
index 97dc30e..97dc30e 100644
--- a/liveusb/olpc.py
+++ b/tails_installer/olpc.py
diff --git a/liveusb/releases.py b/tails_installer/releases.py
index b483d7b..b483d7b 100644
--- a/liveusb/releases.py
+++ b/tails_installer/releases.py
diff --git a/liveusb/source.py b/tails_installer/source.py
index ea46f7e..2329d0f 100644
--- a/liveusb/source.py
+++ b/tails_installer/source.py
@@ -5,10 +5,10 @@ import shutil
import sys
import subprocess
from stat import ST_SIZE
-from liveusb import _
-from liveusb.releases import releases
-from liveusb.config import config
-from liveusb.utils import (_to_unicode, _dir_size, iso_is_live_system,
+from tails_installer import _
+from tails_installer.releases import releases
+from tails_installer.config import config
+from tails_installer.utils import (_to_unicode, _dir_size, iso_is_live_system,
unicode_to_utf8, _set_liberal_perms_recursive,
underlying_physical_device)
diff --git a/liveusb/urlgrabber/__init__.py b/tails_installer/urlgrabber/__init__.py
index 5e6f8d3..5e6f8d3 100644
--- a/liveusb/urlgrabber/__init__.py
+++ b/tails_installer/urlgrabber/__init__.py
diff --git a/liveusb/urlgrabber/byterange.py b/tails_installer/urlgrabber/byterange.py
index e037562..e037562 100644
--- a/liveusb/urlgrabber/byterange.py
+++ b/tails_installer/urlgrabber/byterange.py
diff --git a/liveusb/urlgrabber/grabber.py b/tails_installer/urlgrabber/grabber.py
index 8d396a6..8d396a6 100644
--- a/liveusb/urlgrabber/grabber.py
+++ b/tails_installer/urlgrabber/grabber.py
diff --git a/liveusb/urlgrabber/keepalive.py b/tails_installer/urlgrabber/keepalive.py
index df796bd..df796bd 100644
--- a/liveusb/urlgrabber/keepalive.py
+++ b/tails_installer/urlgrabber/keepalive.py
diff --git a/liveusb/urlgrabber/mirror.py b/tails_installer/urlgrabber/mirror.py
index 3a39986..3a39986 100644
--- a/liveusb/urlgrabber/mirror.py
+++ b/tails_installer/urlgrabber/mirror.py
diff --git a/liveusb/urlgrabber/progress.py b/tails_installer/urlgrabber/progress.py
index ed8130c..ed8130c 100644
--- a/liveusb/urlgrabber/progress.py
+++ b/tails_installer/urlgrabber/progress.py
diff --git a/liveusb/utils.py b/tails_installer/utils.py
index 6174fcd..f5689ec 100644
--- a/liveusb/utils.py
+++ b/tails_installer/utils.py
@@ -6,8 +6,8 @@ import subprocess
import shutil
import stat
import sys
-from liveusb import _
-from liveusb.config import config
+from tails_installer import _
+from tails_installer.config import config
if 'linux' in sys.platform:
from gi.repository import GLib
@@ -103,12 +103,12 @@ def _format_bytes_in_gb(value):
def _get_datadir():
script_path = os.path.abspath(sys.argv[0])
if not script_path.startswith('/usr/'):
- if os.path.exists('data/liveusb-creator.ui'):
+ if os.path.exists('data/tails-installer.ui'):
return('data')
elif script_path.startswith('/usr/local/'):
- return('/usr/local/share/liveusb-creator')
+ return('/usr/local/share/tails-installer')
else:
- return('/usr/share/liveusb-creator')
+ return('/usr/share/tails-installer')
def get_open_write_fd(block):
(fd_index, fd_list) = block.call_open_for_restore_sync(
diff --git a/tests/test_creator.py b/tests/test_creator.py
index 4be51e5..91b3493 100644
--- a/tests/test_creator.py
+++ b/tests/test_creator.py
@@ -1,6 +1,6 @@
import os
-class LiveUSBCreatorOptions(object):
+class TailsInstallerCreatorOptions(object):
console = True
force = False
safe = False
@@ -8,17 +8,17 @@ class LiveUSBCreatorOptions(object):
verbose = True
-class TestLiveUSBCreator:
+class TestTailsInstallerCreator:
def _get_creator(self):
- from liveusb import LiveUSBCreator
- opts = LiveUSBCreatorOptions()
- return LiveUSBCreator(opts)
+ from tails_installer import TailsInstallerCreator
+ opts = TailsInstallerCreatorOptions()
+ return TailsInstallerCreator(opts)
def test_creation(self):
- from liveusb import LiveUSBCreator
+ from tails_installer import TailsInstallerCreator
live = self._get_creator()
- assert live and isinstance(live, LiveUSBCreator)
+ assert live and isinstance(live, TailsInstallerCreator)
def test_device_detection(self):
live = self._get_creator()
@@ -29,7 +29,7 @@ class TestLiveUSBCreator:
assert key in live.drives[drive]
def test_releases(self):
- from liveusb.releases import releases
+ from tails_installer.releases import releases
assert releases and len(releases)
for release in releases:
assert release['name']
@@ -90,7 +90,7 @@ class TestLiveUSBCreator:
def test_extract_iso(self):
from glob import glob
- from liveusb.source import LocalIsoSource
+ from tails_installer.source import LocalIsoSource
live = self._get_creator()
live.detect_supported_drives()
isos = filter(lambda x: x.endswith('.iso'),