From d6a828d60b06afe83c3bd27d3d02f5fc19bf9c59 Mon Sep 17 00:00:00 2001 From: abveritas Date: Tue, 17 Apr 2012 11:09:53 +0000 Subject: [PATCH] removing obsolote, conflicting package kgrubeditor, update kde-common with lin-unix chakra-backup.sh --- kde-common/PKGBUILD | 4 +- kde-common/chakra-backup.sh | 44 +++++++----- tools-pkg-kgrubeditor/PKGBUILD | 59 ---------------- .../tools-kgrubeditor.install | 67 ------------------- 4 files changed, 28 insertions(+), 146 deletions(-) delete mode 100644 tools-pkg-kgrubeditor/PKGBUILD delete mode 100644 tools-pkg-kgrubeditor/tools-kgrubeditor.install diff --git a/kde-common/PKGBUILD b/kde-common/PKGBUILD index cdd46e714..be3938bf8 100644 --- a/kde-common/PKGBUILD +++ b/kde-common/PKGBUILD @@ -16,7 +16,7 @@ _origname=common pkgname=kde-common arch=(i686 x86_64) pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="KDE SC - Common Configuration Files, Scripts and Artwork" url="http://www.kde.org" @@ -79,7 +79,7 @@ md5sums=('2afd86671ad0db31718157aecd46d528' 'aaa1958b14518e9b0193afe497da830e' '4e974016ca509f187b4549d95877bacc' '2b0aaf209d35e1e8c660db66e61d13c7' - '660a7650478e5b7115fbb71811b5d9ee' + '9fa87f4ad4c00de34286165b7c4d2887' 'b69be64a51c1f7dd69a6114d99498872' '466d7fc7cab5738d674df45fdeee4eb0' '1c85260174e58fc6efaa8d2cac947761' diff --git a/kde-common/chakra-backup.sh b/kde-common/chakra-backup.sh index 04dd791d4..90af5865f 100644 --- a/kde-common/chakra-backup.sh +++ b/kde-common/chakra-backup.sh @@ -38,9 +38,27 @@ kdialog --dontagain minibackup:helloworld --msgbox "Welcome! \n\nThis is a simpl # SELECT BACKUP SOURCES ########################################################################### -echo "backup selection" -backup_selection=$(kdialog --separate-output --checklist "Select the data you want to backup" emails "Personal Data: EMails and account(s) data" 0 addressbook "Personal Data: Addressbook(s)" 0 wallet "Personal Data: Wallet password database(s)" 0 ssh "Personal Data: SSH keys and configs" 0 subversion "Personal Data: Subversion configs" 0 places "Personal Data: Places (in Dolphin & the file dialog)" 0 remoteview "Personal Data: Network folders" 0 truecrypt "Personal Data: TrueCrypt configs" 0 akregator "Application Settings: Akregator" 0 amarok "Application Settings: Amarok" 0 kaddressbook "Application Settings: Kaddressbook" 0 kate "Application Settings: Kate" 0 kdesvn "Application Settings: KDESVN" 0 kgpg "Application Settings: KGPG" 0 kjots "Application Settings: KJots" 0 kmail "Application Settings: KMail" 0 knotes "Application Settings: KNotes" 0 konsole "Application Settings: Konsole" 0 kontact "Application Settings: Kontact" 0 kopete "Application Settings: Kopete" 0 korganizer "Application Settings: KOrganizer" 0 kwallet "Application Settings: KWallet" 0 kwrite "Application Settings: KWrite" 0 powerdevil "Application Settings: PowerDevil" 0 systemsettings "Application Settings: Systemsettings" 0 museek "Application Settings: Museek" 0 skype "Application Settings: Skype" 0 opera "Application Settings: Opera" 0 --title "miniBackup") +while true ; do + echo "backup selection" + backup_selection=$(kdialog --separate-output --checklist "Select the data you want to backup" personalSettings "Personal Data:" off addressbook " Addressbook" off emails " Emails and all account data" off places " Places (in Dolphin & the file dialog)" off remoteview " Network folders" off ssh " SSH keys and configurations" off subversion " Subversion configurations" off truecrypt " TrueCrypt configurations" off wallet " KWallet passwords" off blank "" off applicationSettings "Application Settings:" off akregator " Akregator" off amarok " Amarok" off kaddressbook " KAddressBook" off kate " Kate" off kdesrc " kdesrc-build" off kgpg " KGpg" off kjots " KJots" off kmail " KMail" off knotes " KNotes" off konsole " Konsole" off kontact " Kontact" off kopete " Kopete" off korganizer " KOrganizer" off kwallet " KWallet" off kwrite " KWrite" off museek " Museek" off opera " Opera" off powerdevil " PowerDevil" off skype " Skype" off systemsettings " System Settings" off --title "miniBackup" --geometry 300x300) + case $? in + 1) exit ;; + 0) + if [ -n "$backup_selection" ] ; then + for selec in $backup_selection; do + if [[ "$selec" != "personalSettings" ]] && [[ "$selec" != "applicationSettings" ]] && [[ "$selec" != "blank" ]] ; then + found=true + break + fi + done + + if [ $found ] ; then + break + fi + fi ;; + esac +done ########################################################################### @@ -50,7 +68,7 @@ backup_selection=$(kdialog --separate-output --checklist "Select the data you wa echo "select target dir" StoreFLDR=$(kdialog --getexistingdirectory ~/ --title "Where should i store the backup?") - case $? in + case $? in 1) exit ;; 0) mkdir -p $StoreFLDR ; echo "" ;; esac @@ -76,7 +94,6 @@ mkdir -p $TempFLDR/.gnupg mkdir -p $TempFLDR/.config mkdir -p $TempFLDR/.local/share - for selection in $backup_selection; do if [ "$selection" = "emails" ] ; then @@ -99,7 +116,7 @@ for selection in $backup_selection; do qdbus $DBUSREF Set org.kde.kdialog.ProgressDialog value 5 qdbus $DBUSREF setLabelText "Copying addressbook ..." cp -r $HOME/$KDEdir/share/apps/kabc $TempFLDR/$KDEdir/share/apps/ - + elif [ "$selection" = "wallet" ] ; then echo $selection; qdbus $DBUSREF Set org.kde.kdialog.ProgressDialog value 6 @@ -156,14 +173,11 @@ for selection in $backup_selection; do cp $HOME/$KDEdir/share/config/katesyntaxhighlightingrc $TempFLDR/$KDEdir/share/config/ cp -r $HOME/$KDEdir/share/apps/kate $TempFLDR/$KDEdir/share/apps/ - elif [ "$selection" = "kdesvn" ] ; then + elif [ "$selection" = "kdesrc" ] ; then echo $selection; qdbus $DBUSREF Set org.kde.kdialog.ProgressDialog value 13 - qdbus $DBUSREF setLabelText "Copying KDESVN Data ..." - cp $HOME/$KDEdir/share/config/kdesvnrc $TempFLDR/$KDEdir/share/config/ - cp $HOME/$KDEdir/share/config/kdesvn.notifyrc $TempFLDR/$KDEdir/share/config/ - cp $HOME/$KDEdir/share/config/kdesvnpartrc $TempFLDR/$KDEdir/share/config/ - cp -r $HOME/$KDEdir/share/apps/kdesvn $TempFLDR/$KDEdir/share/apps/ + qdbus $DBUSREF setLabelText "Copying kdesrc-build Data ..." + cp $HOME/.kdesrc-build $TempFLDR/ elif [ "$selection" = "kjots" ] ; then echo $selection; @@ -274,14 +288,12 @@ for selection in $backup_selection; do cp $HOME/$KDEdir/share/config/amarok-appletsrc $TempFLDR/$KDEdir/share/config/ cp $HOME/$KDEdir/share/config/amarok_homerc $TempFLDR/$KDEdir/share/config/ cp -r $HOME/$KDEdir/share/apps/amarok $TempFLDR/$KDEdir/share/apps/ - fi elif [ "$selection" = "remoteview" ] ; then echo $selection; qdbus $DBUSREF Set org.kde.kdialog.ProgressDialog value 26 qdbus $DBUSREF setLabelText "Copying remoteview Data ..." cp -r $HOME/$KDEdir/share/apps/remoteview $TempFLDR/$KDEdir/share/apps/ - fi elif [ "$selection" = "museek" ] ; then echo $selection; @@ -289,28 +301,24 @@ for selection in $backup_selection; do qdbus $DBUSREF setLabelText "Copying museek Data ..." cp -r $HOME/.museekd $TempFLDR/ cp -r $HOME/.museeq $TempFLDR/ - fi elif [ "$selection" = "subversion" ] ; then echo $selection; qdbus $DBUSREF Set org.kde.kdialog.ProgressDialog value 26 qdbus $DBUSREF setLabelText "Copying museek Data ..." cp -r $HOME/.subversion $TempFLDR/ - fi elif [ "$selection" = "skype" ] ; then echo $selection; qdbus $DBUSREF Set org.kde.kdialog.ProgressDialog value 26 qdbus $DBUSREF setLabelText "Copying Skype Data ..." cp -r $HOME/.Skype $TempFLDR/ - fi elif [ "$selection" = "truecrypt" ] ; then echo $selection; qdbus $DBUSREF Set org.kde.kdialog.ProgressDialog value 26 qdbus $DBUSREF setLabelText "Copying TrueCrypt Data ..." cp -r $HOME/.TrueCrypt $TempFLDR/ - fi elif [ "$selection" = "opera" ] ; then echo $selection; @@ -371,4 +379,4 @@ qdbus $DBUSREF org.kde.kdialog.ProgressDialog.close kdialog --dontagain minibackup:alldone --msgbox "All done! \n\nYour backup has been saved to \n\n$StoreFLDR/backup.$Date.tar.bz2 \n" -exit 0 \ No newline at end of file +exit 0 diff --git a/tools-pkg-kgrubeditor/PKGBUILD b/tools-pkg-kgrubeditor/PKGBUILD deleted file mode 100644 index a45eb61bd..000000000 --- a/tools-pkg-kgrubeditor/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -# original name -_origname=KGRUBEditor - - - -# -# package info -# -pkgname=kgrubeditor -arch=('i686' 'x86_64') -pkgver=0.8.5 -pkgrel=3 - -pkgdesc="A KDE 4 GUI for GRUB" -url="http://sourceforge.net/projects/${pkgname}" -license=('GPL') - -conflicts=('qgrubeditor' 'kgrubeditor') - -depends=('grub' "kdelibs>=${_kdever}") - -makedepends=('cmake') -options=('!splithdr') - -groups=('kde' 'kde-complete' 'kde-uninstall' 'kde-tools') -categories=('system') -install=tools-kgrubeditor.install - -source=(http://surfnet.dl.sourceforge.net/sourceforge/kgrubeditor/KGRUBEditor-0.8.5-src.tar.bz2) -md5sums=('c6d1fb21989f403276103887f344fdf3') # KGRUBEditor-0.8.5-src.tar.bz2 - - -# -# build function -# -build() -{ - cd $startdir/src/kgrubeditor-0.8.5 - mkdir -p build/ - cd build/ - - cmake -DCMAKE_INSTALL_PREFIX=${_installprefix} -DCMAKE_BUILD_TYPE=${_build_type} .. - - make || return 1 - make DESTDIR=${pkgdir} install - - # show in systemsettings only - rm -rf ${pkgdir}/usr/share/applications/kde4/kgrubeditor_app.desktop - rm -rf ${pkgdir}/usr/share/applications/kgrubeditor_app.desktop -} diff --git a/tools-pkg-kgrubeditor/tools-kgrubeditor.install b/tools-pkg-kgrubeditor/tools-kgrubeditor.install deleted file mode 100644 index d7da14924..000000000 --- a/tools-pkg-kgrubeditor/tools-kgrubeditor.install +++ /dev/null @@ -1,67 +0,0 @@ -post_install() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -post_upgrade() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -post_remove() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -op=$1 -shift - -$op $*