Commit 4fb80afa authored by rgaudin's avatar rgaudin
Browse files

rebranding Pibox installer into Kiwix-plug installer

parent 3798d765
......@@ -51,20 +51,20 @@ matrix:
- security import pibox-installer.p12 -k build.keychain -P $MACOS_CERTIFICATE_PASSWORD -A
- "security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain"
- security find-identity -v
- "codesign -s \"Developer ID Application: Wikimedia CH (L7HWM3SP3L)\" dist/pibox-installer.app --deep"
- "codesign -s \"Developer ID Application: Wikimedia CH (L7HWM3SP3L)\" dist/kiwix-plug_installer.app --deep"
# Install and run create-dmg
- npm install --global create-dmg@2.0.0 --python=python2.7
- create-dmg dist/pibox-installer.app || true
- mv pibox-installer-0.0.0.dmg pibox-installer-macos.dmg
- create-dmg dist/kiwix-plug_installer.app || true
- mv kiwix-plug_installer-0.0.0.dmg kiwix-plug_installer-macos.dmg
# Send dmg
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then DESTINATION="/var/www/download.kiwix.org/nightly/$(date +'%Y-%m-%d')"; else DESTINATION="/var/www/tmp.kiwix.org/ci"; fi
- BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}
- scp -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa pibox-installer-macos.dmg nightlybot@download.kiwix.org:$DESTINATION/pibox-installer-macos-$BRANCH.dmg
- scp -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-plug_installer-macos.dmg nightlybot@download.kiwix.org:$DESTINATION/kiwix-plug_installer-macos-$BRANCH.dmg
- PIBOX_RELEASE=$(echo $TRAVIS_TAG | grep -x 'v[[:digit:]]\+.[[:digit:]]\+\(.[[:digit:]]\+\)*\(-rc[[:digit:]]\+\)\?') || true
- if [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE; cp pibox-installer-macos.dmg releases/$PIBOX_RELEASE/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi
- if [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE; cp kiwix-plug_installer-macos.dmg releases/$PIBOX_RELEASE/; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi
- os: linux
language: python
......@@ -119,13 +119,13 @@ matrix:
# Archive
- cd dist
- tar czvf pibox-installer-linux.tar.gz pibox-installer
- tar czvf kiwix-plug_installer-linux.tar.gz kiwix-plug_installer
- cd ..
# Deploy
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then DESTINATION="/var/www/download.kiwix.org/nightly/$(date +'%Y-%m-%d')"; else DESTINATION="/var/www/tmp.kiwix.org/ci"; fi
- BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}
- scp -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa dist/pibox-installer-linux.tar.gz nightlybot@download.kiwix.org:$DESTINATION/pibox-installer-linux-$BRANCH.tar.gz
- scp -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa dist/kiwix-plug_installer-linux.tar.gz nightlybot@download.kiwix.org:$DESTINATION/kiwix-plug_installer-linux-$BRANCH.tar.gz
- PIBOX_RELEASE=$(echo $TRAVIS_TAG | grep -x 'v[[:digit:]]\+.[[:digit:]]\+\(.[[:digit:]]\+\)*\(-rc[[:digit:]]\+\)\?') || true
- if [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE; cp dist/pibox-installer-linux.tar.gz releases/$PIBOX_RELEASE; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi
- if [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE; cp dist/kiwix-plug_installer-linux.tar.gz releases/$PIBOX_RELEASE; scp -r -v -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi
# Authors and contributors
pibox installer is owned and maintained by Guillaume Thiolliere
Kiwix-plug installer (formerly pibox installer) is owned and maintained by Guillaume Thiolliere
and published under the terms of GPLv3 license or (at your option) any later version
(see [LICENSE](https://framagit.org/ideascube/pibox-installer/blob/master/LICENSE)).
......
# Pibox installer
# Kiwix-plug installer
This installer install [Ideascube](https://framagit.org/ideascube/ideascube) on an SD card for raspberrypi 2 or raspberrypi 3.
Ideascube is a solution to serve offline content from the web such as Wikipedia, the Gutenberg library, TED talks.
Pibox installer configure the RaspberryPi into a hotspot WiFi with Ideascube server and offline contents.
Kiwix-plug installer configure the RaspberryPi into a hotspot WiFi with Ideascube server and offline contents.
## Download
......
......@@ -93,17 +93,17 @@ install:
- if %platform%==x64 type build\pibox-installer-win64\warnpibox-installer-win64.txt
# Deploy
- cd C:\projects\pibox-installer\dist\pibox-installer
- 7z.exe a -m0=Copy C:\projects\pibox-installer\windows_bundle\pibox-installer.exe *
- cd C:\projects\pibox-installer\dist\kiwix-plug_installer
- 7z.exe a -m0=Copy C:\projects\pibox-installer\windows_bundle\kiwix-plug_installer.exe *
- if %platform%==x86 move C:\projects\pibox-installer\windows_bundle\pibox-installer.exe C:\msys64\home\appveyor\pibox-installer-win32.exe
- if %platform%==x64 move C:\projects\pibox-installer\windows_bundle\pibox-installer.exe C:\msys64\home\appveyor\pibox-installer-win64.exe
- if %platform%==x86 move C:\projects\pibox-installer\windows_bundle\kiwix-plug_installer.exe C:\msys64\home\appveyor\kiwix-plug_installer-win32.exe
- if %platform%==x64 move C:\projects\pibox-installer\windows_bundle\kiwix-plug_installer.exe C:\msys64\home\appveyor\kiwix-plug_installer-win64.exe
- move C:\projects\pibox-installer\pibox_installer_ci_rsa C:\msys64\home\appveyor\
- if defined APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH (echo %APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH% > branch.txt) else (echo %APPVEYOR_REPO_BRANCH% > branch.txt)
- move branch.txt C:\msys64\home\appveyor\
- if %platform%==x86 C:\msys64\usr\bin\bash --login -c "DESTINATION=$(cat /c/destination-ps.txt | tr -d '\r' | tr -d '\n') ; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa pibox-installer-win32.exe nightlybot@download.kiwix.org:$DESTINATION/pibox-installer-win32-$(cat branch.txt | sed 's/ //g').exe"
- if %platform%==x64 C:\msys64\usr\bin\bash --login -c "DESTINATION=$(cat /c/destination-ps.txt | tr -d '\r' | tr -d '\n') ; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa pibox-installer-win64.exe nightlybot@download.kiwix.org:$DESTINATION/pibox-installer-win64-$(cat branch.txt | sed 's/ //g').exe"
- if %platform%==x86 C:\msys64\usr\bin\bash --login -c "DESTINATION=$(cat /c/destination-ps.txt | tr -d '\r' | tr -d '\n') ; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-plug_installer-win32.exe nightlybot@download.kiwix.org:$DESTINATION/kiwix-plug_installer-win32-$(cat branch.txt | sed 's/ //g').exe"
- if %platform%==x64 C:\msys64\usr\bin\bash --login -c "DESTINATION=$(cat /c/destination-ps.txt | tr -d '\r' | tr -d '\n') ; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa kiwix-plug_installer-win64.exe nightlybot@download.kiwix.org:$DESTINATION/kiwix-plug_installer-win64-$(cat branch.txt | sed 's/ //g').exe"
- if defined APPVEYOR_REPO_TAG_NAME (echo %APPVEYOR_REPO_TAG_NAME% > C:\msys64\home\appveyor\tag.txt)
- C:\msys64\usr\bin\bash --login -c "PIBOX_RELEASE=$(cat tag.txt | sed 's/ //g' | grep -x 'v[[:digit:]]\+.[[:digit:]]\+\(.[[:digit:]]\+\)*\(-rc[[:digit:]]\+\)\?') || true; if [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE/; cp pibox-installer-win*.exe releases/$PIBOX_RELEASE/; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi"
- C:\msys64\usr\bin\bash --login -c "PIBOX_RELEASE=$(cat tag.txt | sed 's/ //g' | grep -x 'v[[:digit:]]\+.[[:digit:]]\+\(.[[:digit:]]\+\)*\(-rc[[:digit:]]\+\)\?') || true; if [ $PIBOX_RELEASE ]; then mkdir -p releases/$PIBOX_RELEASE/; cp kiwix-plug_installer-win*.exe releases/$PIBOX_RELEASE/; scp -r -o StrictHostKeyChecking=no -i pibox_installer_ci_rsa releases/$PIBOX_RELEASE nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release/kiwix-plug_installer/; fi"
......@@ -25,7 +25,7 @@ exe = EXE(pyz,
a.binaries,
a.zipfiles,
a.datas,
name='pibox-installer',
name='kiwix-plug_installer',
debug=False,
strip=False,
upx=True,
......
......@@ -26,7 +26,7 @@ pyz = PYZ(a.pure, a.zipped_data,
exe = EXE(pyz,
a.scripts,
exclude_binaries=True,
name='pibox-installer',
name='kiwix-plug_installer',
debug=False,
strip=False,
upx=True,
......@@ -37,8 +37,8 @@ coll = COLLECT(exe,
a.datas,
strip=False,
upx=True,
name='pibox-installer')
name='kiwix-plug_installer')
app = BUNDLE(coll,
name='pibox-installer.app',
name='kiwix-plug_installer.app',
icon='pibox-installer-logo.icns',
bundle_identifier='org.ideascube.pibox')
bundle_identifier='org.kiwix.plug')
......@@ -44,4 +44,4 @@ coll = COLLECT(exe,
a.datas,
strip=False,
upx=True,
name='pibox-installer')
name='kiwix-plug_installer')
......@@ -44,4 +44,4 @@ coll = COLLECT(exe,
a.datas,
strip=False,
upx=True,
name='pibox-installer')
name='kiwix-plug_installer')
......@@ -375,7 +375,7 @@ def get_required_image_size(collection):
def get_required_building_space(collection, cache_folder, image_size=None):
''' total required space to host downlaods and image '''
# the pibox master image
# the master image
# we neglect the master's expanded size as it is going to be moved
# to the image path and resized in-place (never reduced)
base_image_size = get_content('pibox_base_image').get('archive_size')
......
......@@ -195,7 +195,7 @@ class _RunningInstance:
def raise_timeout():
timeout_event.set()
os.write(writer_fd, b"\nPibox installer: QEMU boot timeout\n")
os.write(writer_fd, b"\nQEMU boot timeout\n")
ring_buf = collections.deque(maxlen=len(signal))
while True:
......
......@@ -211,7 +211,7 @@ else:
args.human_size = human_readable_size(args.size, False)
# display configuration and offer time to cancel
print("Pibox-installer configuration:")
print("Kiwix-plug installer configuration:")
keys = args.__dict__.keys()
longest = max([len(key) for key in keys])
for name in keys:
......
......@@ -43,7 +43,7 @@ def run():
class ShortDialog(Gtk.Dialog):
def __init__(self, parent, buttons, msg):
Gtk.Dialog.__init__(self, "pibox installer - dialog", parent, 0, buttons)
Gtk.Dialog.__init__(self, "kiwix-plug installer", parent, 0, buttons)
self.set_default_size(150, 100)
label = Gtk.Label(msg)
box = self.get_content_area()
......@@ -121,7 +121,7 @@ class Logger(ProgressHelper):
# update overall percentage on window title
self.component.run_window.set_title(
"Pibox installer ({:.0f}%)"
"Kiwix-plug installer ({:.0f}%)"
.format(self.get_overall_progress() * 100))
# update stage name and number (Stage x/y)
......@@ -572,11 +572,11 @@ class Application:
self.set_config(config)
if for_save:
title = "Select a file to save Pibox config to"
title = "Select a file to save Kiwix-plug config to"
action = Gtk.FileChooserAction.SAVE
on_accept = _save
else:
title = "Select Pibox config file to load"
title = "Select Kiwix-plug config file to load"
action = Gtk.FileChooserAction.OPEN
on_accept = _load
......@@ -833,7 +833,7 @@ class Application:
all_valid = True
project_name = self.component.project_name_entry.get_text()
allowed_chars = set(string.ascii_uppercase + string.ascii_lowercase + string.digits + '-')
allowed_chars = set(string.ascii_uppercase + string.ascii_lowercase + string.digits + '-' + ' ')
condition = len(project_name) >= 1 and len(project_name) <= 64 and set(project_name) <= allowed_chars
validate_label(self.component.project_name_label, condition)
self.component.project_name_constraints_revealer.set_reveal_child(not condition)
......
......@@ -128,7 +128,7 @@ def main(logger,
logger.std("SUCCESS! {} was built successfuly".format(image_fpath))
parser = argparse.ArgumentParser(description="pibox base image creator")
parser = argparse.ArgumentParser(description="Kiwix-plug base image creator")
parser.add_argument("--root", help="root partition size (GB)", default=7)
parser.add_argument("--size", help="Image (SD card) size (GB)", default=8)
parser.add_argument("--build", help="Folder to create files in",
......
......@@ -36,9 +36,9 @@ def run_installation(name, timezone, language, wifi_pwd, admin_account, kalite,
# set image names
today = datetime.today().strftime('%Y_%m_%d-%H_%M_%S')
image_final_path = os.path.join(build_dir, "pibox-{}.img".format(today))
image_building_path = os.path.join(build_dir, "pibox-{}.BUILDING.img".format(today))
image_error_path = os.path.join(build_dir, "pibox-{}.ERROR.img".format(today))
image_final_path = os.path.join(build_dir, "plug-{}.img".format(today))
image_building_path = os.path.join(build_dir, "plug-{}.BUILDING.img".format(today))
image_error_path = os.path.join(build_dir, "plug-{}.ERROR.img".format(today))
# Prepare SD Card
if sd_card:
......@@ -66,11 +66,11 @@ def run_installation(name, timezone, language, wifi_pwd, admin_account, kalite,
# Download Base image
logger.stage('master')
logger.step("Retrieving pibox base image file")
logger.step("Retrieving base image file")
base_image = get_content('pibox_base_image')
rf = download_content(base_image, logger, build_dir)
if not rf.successful:
logger.err("Failed to download pibox base image.\n{e}"
logger.err("Failed to download base image.\n{e}"
.format(e=rf.exception))
sys.exit(1)
elif rf.found:
......
......@@ -46,7 +46,7 @@
</object>
<object class="GtkWindow" id="run_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Pibox installer</property>
<property name="title" translatable="yes">Kiwix-plug installer</property>
<property name="default_width">640</property>
<property name="default_height">480</property>
<child>
......@@ -218,7 +218,7 @@
</object>
<object class="GtkWindow" id="done_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Pibox installer</property>
<property name="title" translatable="yes">Kiwix-plug installer</property>
<property name="modal">True</property>
<property name="default_width">320</property>
<property name="default_height">240</property>
......@@ -271,7 +271,7 @@
</object>
<object class="GtkWindow" id="window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Pibox installer</property>
<property name="title" translatable="yes">Kiwix-plug installer</property>
<child>
<object class="GtkBox" id="no_id_56">
<property name="visible">True</property>
......@@ -364,7 +364,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Machine and WiFi name</property>
<property name="label" translatable="yes">Pibox name :</property>
<property name="label" translatable="yes">Plug name :</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -376,7 +376,7 @@
<object class="GtkEntry" id="project_name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">pibox</property>
<property name="text" translatable="yes">Kiwix Plug</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -640,7 +640,7 @@ It can be modified after installation using the file:
<object class="GtkEntry" id="wifi_password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">piboxwifipwd</property>
<property name="text" translatable="yes">kiwixplug-wifipwd</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -1461,7 +1461,7 @@ In File mode the image is created at build path, you can choose the size
<property name="can_focus">False</property>
<property name="type_hint">dialog</property>
<property name="transient_for">window</property>
<property name="program_name">Pibox Installer</property>
<property name="program_name">Kiwix-plug installer</property>
<property name="version">nightly</property>
<property name="website">https://framagit.org/ideascube/pibox-installer</property>
<property name="logo_icon_name">image-missing</property>
......@@ -1493,7 +1493,7 @@ In File mode the image is created at build path, you can choose the size
</object>
<object class="GtkWindow" id="space_error_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Pibox installer</property>
<property name="title" translatable="yes">Kiwix-plug installer</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="transient_for">window</property>
......@@ -1710,7 +1710,7 @@ In File mode the image is created at build path, you can choose the size
</object>
<object class="GtkWindow" id="zim_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Pibox installer</property>
<property name="title" translatable="yes">Kiwix-plug installer</property>
<property name="modal">True</property>
<property name="default_width">1025</property>
<property name="default_height">640</property>
......
This directory contains files for windows bundling.
* pibox-installer-sfx-conf.txt: the configuration for 7z SFX Builder
* pibox-installer.exe: a self extracting empty archive generated with 7z sfx builder using 7zS.sfx.
* kiwix-plug_installer.exe: a self extracting empty archive generated with 7z sfx builder using 7zS.sfx.
program run is launcher.exe
;!@Install@!UTF-8!
Title="Pibox installer"
Title="Kiwix-plug installer"
MiscFlags="4"
RunProgram="launcher.exe"
;Config file generated by 7z SFX Builder v2.1. (http://sourceforge.net/projects/s-zipsfxbuilder/)
;!@InstallEnd@!
7zSFXBuilder_7zArchive=C:\Users\user\Desktop\empty_file.7z
7zSFXBuilder_SFXName=C:\Users\user\Desktop\pibox-installer.exe
7zSFXBuilder_SFXName=C:\Users\user\Desktop\kiwix-plug_installer.exe
7zSFXBuilder_SFXIcon=C:\Users\user\Pictures\pibox-installer-logo.ico
7zSFXBuilder_UseDefMod=7zsd_All
7zSFXBuilder_UPXCommands=--ultra-brute
7zSFXBuilder_Res_FileVersion=
7zSFXBuilder_Res_CompanyName=Ideascube
7zSFXBuilder_Res_CompanyName=Kiwix
7zSFXBuilder_Res_Comments=
7zSFXBuilder_Res_FileDescription=
7zSFXBuilder_Res_ProductVersion=
7zSFXBuilder_Res_ProductName=Pibox installer
7zSFXBuilder_Res_ProductName=Kiwix-plug installer
7zSFXBuilder_Res_LegalCopyright=
7zSFXBuilder_Res_LegalTrademarks=
7zSFXBuilder_Res_InternalName=
7zSFXBuilder_Res_OriginalFileName=
7zSFXBuilder_Res_SpecialBuild=
7zSFXBuilder_Res_PrivateBuild=
\ No newline at end of file
7zSFXBuilder_Res_PrivateBuild=
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment