From eb50508ce7884eb829a66cf1b15530ff57d63568 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 12 Mar 2012 15:02:22 +0100 Subject: [PATCH] usbinstall: remove (replaced by external package with same name) --- Makefile | 15 ---- usbinstall/po/it.po | 85 ------------------ usbinstall/usbinstall.desktop | 13 --- usbinstall/usbinstall.sh | 156 ---------------------------------- 4 files changed, 269 deletions(-) delete mode 100644 usbinstall/po/it.po delete mode 100644 usbinstall/usbinstall.desktop delete mode 100644 usbinstall/usbinstall.sh diff --git a/Makefile b/Makefile index 1e0448d..77e1959 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,6 @@ mambawelcomedatadir = ${datadir}/openmamba/mambawelcome mambaimagesdir = ${datadir}/openmamba/images xramdrdatadir = ${datadir}/openmamba/xramdr bootrecoverdatadir = ${datadir}/openmamba/bootrecover -usbinstalldatadir = ${datadir}/openmamba/usbinstall iconsdir = ${datadir}/icons/hicolor kdeprefixdir = $(shell kde-config --prefix) kdedatadir = $(kdeprefixdir)/share @@ -92,7 +91,6 @@ pck_desktop := $(wildcard desktop/*.tar.bz2) pck_catalogs := $(wildcard mambabase/po/*.po) pck_catalogs1 := $(wildcard mambawelcome/po/*.po) pck_catalogs2 := $(wildcard bootrecover/po/*.po) -pck_catalogs3 := $(wildcard usbinstall/po/*.po) .SUFFIXES: .SUFFIXES: .in .po .mo @@ -147,13 +145,6 @@ install-locales: locales $(INSTALL_DIR) $$dir;\ $(INSTALL_DATA) $${f/.po/.mo} $$dir/bootrecover.mo;\ done - @for f in $(pck_catalogs3); do\ - lang=`echo $$f | sed 's,.*/\(.*\)\.po,\1,'`;\ - echo "installing i18n file for language \`$$lang'...";\ - dir="$(DESTDIR)$(localesdir)/$$lang/LC_MESSAGES";\ - $(INSTALL_DIR) $$dir;\ - $(INSTALL_DATA) $${f/.po/.mo} $$dir/usbinstall.mo;\ - done install-kde-distro-addons: dist-update @$(INSTALL_DIR) $(DESTDIR)$(sysconfdir) @@ -280,11 +271,6 @@ install-desktop: $(INSTALL_DATA) $(pck_desktop) $(DESTDIR)$(distrodesktopdir) $(INSTALL_SCRIPT) desktop/desktop-firsttime.sh $(DESTDIR)$(xprofiledir) -install-usbinstall: - @$(INSTALL_DIR) $(DESTDIR)$(usbinstalldatadir) - $(INSTALL_SCRIPT) usbinstall/usbinstall.sh $(DESTDIR)$(usbinstalldatadir) - $(INSTALL_DATA) usbinstall/usbinstall.desktop $(DESTDIR)$(xdg_appsdir) - install-openmamba-update: @$(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_SCRIPT) openmamba-update/openmamba-update $(DESTDIR)$(bindir) @@ -294,7 +280,6 @@ install: $(pck_infiles:.in=) \ install-kde-distro-addons \ install-distromenu \ install-srpms \ - install-usbinstall \ install-desktop \ install-openmamba-update \ install-mambabase \ diff --git a/usbinstall/po/it.po b/usbinstall/po/it.po deleted file mode 100644 index 3de9128..0000000 --- a/usbinstall/po/it.po +++ /dev/null @@ -1,85 +0,0 @@ -# Italian translation of openmamba-usbinstall. -# Copyright (C) 2009 Ercole 'ercolinux' Carpanetto -# This file is distributed under the same license as the openmamba-usbinstall package. -# Ercole 'ercolinux' Carpanetto , 2009. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: 1.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-01 23:12+0100\n" -"PO-Revision-Date: 2009-12-01 23:12+0100\n" -"Last-Translator: Ercole 'ercolinux' Carpanetto \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: openmamba-usbinstall.sh:25 -msgid "" -"Warning all the data on the usb key ${vendor[$chiave]} ${model[$chiave]} with ${size[$chiave]} GB will be destroyed!" -msgstr "" -"Attenzione tutti i dati sulla chiavetta ${vendor[$chiave]} ${model[$chiave]} di ${size[$chiave]} GB saranno cancellati!" - -#: openmamba-usbinstall.sh:27 -msgid "openmamba installation on USB device" -msgstr "Installazione di openmamba su dispositivo USB" - -#: openmamba-usbinstall.sh:27 -msgid "Starting installation..." -msgstr "Avvio dell'installazione..." - -#: openmamba-usbinstall.sh:32 -msgid "Creating partitions..." -msgstr "Creazione delle partizioni..." - -#: openmamba-usbinstall.sh:51 -msgid "Formatting..." -msgstr "Formattazione..." - -#: openmamba-usbinstall.sh:55 -msgid "Mounting and file creation..." -msgstr "Montaggio e creazione files..." - -#: openmamba-usbinstall.sh:60 -msgid "Verifing files and eventually download from internet..." -msgstr "Verifica dei files ed eventuale download da internet..." - -#: openmamba-usbinstall.sh:63 -msgid "" -"Please select the 'bootusb' archive or press Cancel to download it" -msgstr "" -"Seleziona l'archivio 'bootusb' o premi Cancella per scaricarlo" - -#: openmamba-usbinstall.sh:66 -msgid "Please select the ISO image or press Cancel to download it" -msgstr "Seleziona l'immagine ISO o premi Cancella per scaricarla" - -#: openmamba-usbinstall.sh:72 -msgid "Installing files..." -msgstr "Installazione dei files..." - -#: openmamba-usbinstall.sh:76 -msgid "Installing bootloader..." -msgstr "Installazione del bootloader..." - -#: openmamba-usbinstall.sh:79 -msgid "Copying ISO image..." -msgstr "Copia immagine ISO..." - -#: openmamba-usbinstall.sh:116 -msgid "USB key missing" -msgstr "Chiavetta USB non inserita" - -#: openmamba-usbinstall.sh:116 -msgid "Please insert a USB key or press No" -msgstr "Per favore inserisci una chiavetta USB o premi No" - -#: openmamba-usbinstall.sh:128 openmamba-usbinstall.sh:131 -#: openmamba-usbinstall.sh:134 -msgid "Select the USB key on which you want to install openmamba" -msgstr "Seleziona la chiavetta USB su cui installare openmamba" - diff --git a/usbinstall/usbinstall.desktop b/usbinstall/usbinstall.desktop deleted file mode 100644 index 857ccaf..0000000 --- a/usbinstall/usbinstall.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Name=openmamba USB installation -Name[it]=Installazione di openmamba USB -GenericName=Prepares an openmamba live system on a USB storage -GenericName[it]=Prepara una chiavetta USB con openmamba live -Exec=/usr/share/openmamba/usbinstall/usbinstall.sh -Icon=mamba -Terminal=0 -Type=Application -Categories=X-openmamba; -X-KDE-RootOnly=true -X-KDE-SubstituteUID=true -X-KDE-Username=root diff --git a/usbinstall/usbinstall.sh b/usbinstall/usbinstall.sh deleted file mode 100644 index cbb5372..0000000 --- a/usbinstall/usbinstall.sh +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/bash -# openmamba-usbinstall è uno script per la generazione automatica di una chiavetta di boot per openmamba snapshot. -# Se i file necessari sono presenti sul disco fisso verranno utilizzati quelli altrimenti -# scaricherà direttamente la versione attuale dal sito di openmamba. -# se il file iso è presente nella home verrà usato direttamente altrimenti si aprirà un dialogo dove sarà possibile cercarlo. -# (c) 2009 ercole 'ercolinux' carpanetto - ercole69@gmail.com -# (c) 2009-2010 Silvan Calarco - silvan.calarco@mambasoft.it -# rilasciato secondo la licenza GPL v.3 - -# per cambiare la versione della snapshot di openmamba modificare il valore qui sotto di conseguenza -version=20091201 -version_cd=20091201 -fileiso="~/openmamba-livecd-it-snapshot-"$version_cd".i586.iso" -filecpio=""~/openmamba-bootusb-it-snapshot-"$version".i586.cpio.gz"" - -#da qui in poi non c'è nulla da modificare - -TEXTDOMAIN=usbinstall -TEXTDOMAINDIR=/usr/share/locale/ - -function get_udisks_key() { - LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|" -} - -# formattazione della chiavetta e installazione dei file necessari al boot di openmamba -installa(){ -conferma=0 -chiave=$c -kdialog --title $"openmamba installation on USB device" --yesno $"Warning all the data on the usb key ${vendor[$chiave]} ${model[$chiave]} with ${size[$chiave]} GB will be destroyed!" && conferma=1 - -if [ $conferma -eq 1 ]; then -dcopRef=$(kdialog --geometry 450x140 --title $"openmamba installation on USB device" --progressbar $"Starting installation..." 12) -qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog maximum 20 - -sudo umount ${device[$chiave]}1 -qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 -qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Creating partitions..." -sudo fdisk ${device[$chiave]} <