diff -Nru y-ppa-manager-0.9.9.2/.bzr/branch/last-revision y-ppa-manager-2014.04.17/.bzr/branch/last-revision --- y-ppa-manager-0.9.9.2/.bzr/branch/last-revision 2013-11-27 14:25:34.000000000 +0000 +++ y-ppa-manager-2014.04.17/.bzr/branch/last-revision 2014-04-09 17:46:21.000000000 +0000 @@ -1 +1 @@ -208 webupd8@gmail.com-20131127142534-ifr6j5helnmunp84 +210 webupd8@gmail.com-20140409174621-vsa4wwlwgxfjoo3v Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/checkout/dirstate and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/checkout/dirstate differ diff -Nru y-ppa-manager-0.9.9.2/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.cix y-ppa-manager-2014.04.17/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.cix --- y-ppa-manager-0.9.9.2/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.cix 1970-01-01 00:00:00.000000000 +0000 +++ y-ppa-manager-2014.04.17/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.cix 2014-04-09 17:46:21.000000000 +0000 @@ -0,0 +1,7 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=1 +row_lengths=1 +x 0 ԙ"#H GHа=wws3?g` +6膅Zu.ޏ,wע"(Q=\  \ No newline at end of file Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.iix and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.iix differ Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.rix and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.rix differ diff -Nru y-ppa-manager-0.9.9.2/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.six y-ppa-manager-2014.04.17/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.six --- y-ppa-manager-0.9.9.2/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.six 1970-01-01 00:00:00.000000000 +0000 +++ y-ppa-manager-2014.04.17/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.six 2014-04-09 17:46:21.000000000 +0000 @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= diff -Nru y-ppa-manager-0.9.9.2/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.tix y-ppa-manager-2014.04.17/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.tix --- y-ppa-manager-0.9.9.2/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.tix 1970-01-01 00:00:00.000000000 +0000 +++ y-ppa-manager-2014.04.17/.bzr/repository/indices/6e7652ce0276b5b957fb0ef3d24ac117.tix 2014-04-09 17:46:21.000000000 +0000 @@ -0,0 +1,9 @@ +B+Tree Graph Index 2 +node_ref_lists=1 +key_elements=2 +len=3 +row_lengths=1 +xar a{ +.@gwYA~dW6# jOߘ3Ie5g$@b' +n/Z"TKо;7?EÚP񲤥_iR>*@$\ t ~P1 ElRn~ '0H aFbc>p{Mf!)'), +T \ No newline at end of file Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.cix and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.cix differ Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.iix and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.iix differ Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.rix and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.rix differ diff -Nru y-ppa-manager-0.9.9.2/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.six y-ppa-manager-2014.04.17/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.six --- y-ppa-manager-0.9.9.2/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.six 1970-01-01 00:00:00.000000000 +0000 +++ y-ppa-manager-2014.04.17/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.six 2014-01-30 11:27:39.000000000 +0000 @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.tix and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/indices/d877a50595e16591c835dcea7b27e034.tix differ Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/pack-names and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/pack-names differ Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/packs/6e7652ce0276b5b957fb0ef3d24ac117.pack and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/packs/6e7652ce0276b5b957fb0ef3d24ac117.pack differ Binary files /tmp/zJNnQfIVM8/y-ppa-manager-0.9.9.2/.bzr/repository/packs/d877a50595e16591c835dcea7b27e034.pack and /tmp/2iMKOmM0p6/y-ppa-manager-2014.04.17/.bzr/repository/packs/d877a50595e16591c835dcea7b27e034.pack differ diff -Nru y-ppa-manager-0.9.9.2/CHANGES y-ppa-manager-2014.04.17/CHANGES --- y-ppa-manager-0.9.9.2/CHANGES 2013-11-27 12:16:19.000000000 +0000 +++ y-ppa-manager-2014.04.17/CHANGES 2014-04-17 15:05:03.000000000 +0000 @@ -1,3 +1,8 @@ +0.9.9.3: +fix bug with dpkg being reported as running in some cases when it wasn't actually running, this causing some Y PPA Manager features not to work +fix bug in upgrade dialog with GTK2 +a few other small bug fixes + 0.9.9.2: - Ubuntu 14.04 Trusty Tahr and Linux Mint 16 Petra support - Added install button on Manage PPAs -> List Packages diff -Nru y-ppa-manager-0.9.9.2/debian/changelog y-ppa-manager-2014.04.17/debian/changelog --- y-ppa-manager-0.9.9.2/debian/changelog 2013-11-27 14:27:27.000000000 +0000 +++ y-ppa-manager-2014.04.17/debian/changelog 2014-04-17 15:06:22.000000000 +0000 @@ -1,3 +1,11 @@ +y-ppa-manager (2014.04.17-1~webupd8~0) trusty; urgency=medium + + * fix bug with dpkg being reported as running in some cases when it wasn't actually running, this causing some Y PPA Manager features not to work + * fix bug in upgrade dialog with GTK2 + * a few other small bug fixes + + -- Alin Andrei Thu, 17 Apr 2014 14:20:34 +0300 + y-ppa-manager (0.9.9.2-3~webupd8~saucy) saucy; urgency=medium * Ubuntu 14.04 Trusty Tahr and Linux Mint 16 Petra support diff -Nru y-ppa-manager-0.9.9.2/ppa-upgrade y-ppa-manager-2014.04.17/ppa-upgrade --- y-ppa-manager-0.9.9.2/ppa-upgrade 2013-11-13 11:49:24.000000000 +0000 +++ y-ppa-manager-2014.04.17/ppa-upgrade 2014-04-17 15:02:12.000000000 +0000 @@ -61,7 +61,7 @@ testconnection=`wget --no-check-certificate --tries=3 --timeout=15 www.google.com -O /tmp/.testinternet &>/dev/null 2>&1` if [[ $? != 0 ]]; then echo "You are not connected to the Internet. Please check your Internet connection and try again." - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Internet connection error" --text=" You don't seem to be connected to the Internet. \n This function needs a working internet connection (and working wget) " --button="gtk-ok:0" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Internet connection error" --text=" You don't seem to be connected to the Internet. \n This function needs a working internet connection (and working wget) " --button="gtk-ok:0" ppa_manager_run else echo Internet connection - ok @@ -73,7 +73,7 @@ { if [[ "$UID" -ne "$ROOT_UID" ]]; then - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Cannot run as regular user" --text=" Please run this command from the \n Y PPA Manager Advanced dialog " --button="gtk-ok:0" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Cannot run as regular user" --text=" Please run this command from the \n Y PPA Manager Advanced dialog " --button="gtk-ok:0" echo "Error - Cannot run as regular user! Please run y-ppa-manager as an administrator (e.g. gksu y-ppa-manager)" exit fi @@ -131,7 +131,7 @@ #replace OLD_RELEASE with NEW_RELEASE: replace_old_new() { -Y_UPGRADE_PPA=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" Will scan all existing PPAs and replace the old Ubuntu version with \n the new Ubuntu version you enter below (only for PPAs that work \n with the new Ubuntu version) " --field="Current Ubuntu version. E.g. saucy" --field="Previous Ubuntu version. E.g. raring" --button="gtk-cancel:1" --button="gtk-ok:0"` +Y_UPGRADE_PPA=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text-align=fill --borders=10 --text="Will scan all existing PPAs and replace the old Ubuntu version with the new Ubuntu version you enter below (only for PPAs that work with the new Ubuntu version)" --field="Current Ubuntu version. E.g. trusty" --field="Previous Ubuntu version. E.g. saucy" --button="gtk-cancel:1" --button="gtk-ok:0"` ret=$? if [[ $ret -eq 0 ]]; then su $loggeduser -s /bin/bash -c "${DBUS} notify-send -h int:transient:1 -t 10000 -u normal --icon=object-flip-vertical \"Y PPA Manager\" \"Updating release name in working PPAs. This may take a while...\"" @@ -146,7 +146,7 @@ #update PPAs disabled after regular upgrade: update_after_regular_upgrade() { -yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" Will scan all PPAs disabled after \n upgrade and re-enable those that work \n with your current Ubuntu version " --button="gtk-cancel:1" --button="gtk-ok:0" +yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" Will scan all PPAs disabled after \n upgrade and re-enable those that work \n with your current Ubuntu version " --button="gtk-cancel:1" --button="gtk-ok:0" ret=$? if [[ $ret -eq 0 ]]; then diff -Nru y-ppa-manager-0.9.9.2/y-ppa-cmd y-ppa-manager-2014.04.17/y-ppa-cmd --- y-ppa-manager-0.9.9.2/y-ppa-cmd 2013-11-27 14:23:17.000000000 +0000 +++ y-ppa-manager-2014.04.17/y-ppa-cmd 2014-03-14 09:22:39.000000000 +0000 @@ -96,7 +96,7 @@ testconnection=`wget --no-check-certificate --tries=3 --timeout=15 www.google.com -O /tmp/.testinternet &>/dev/null 2>&1` if [[ $? != 0 ]]; then echo "You are not connected to the Internet. Please check your Internet connection and try again." - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Internet connection error" --text=" You don't seem to be connected to the Internet. \n This function needs a working internet connection (and working wget) " --button="gtk-ok:0" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Internet connection error" --text=" You don't seem to be connected to the Internet. \n This function needs a working internet connection (and working wget) " --button="gtk-ok:0" ppa_manager_run else echo Internet connection - ok @@ -107,12 +107,12 @@ function checkAPT() { sleep 1 - for lock in synaptic update-manager software-center apt-get dpkg aptitude + for lock in synaptic update-manager software-center apt-get "dpkg " aptitude do - if ps -U root -u root u | grep $lock | grep -v grep > /dev/null; + if ps -U root -u root u | grep "$lock" | grep -v grep > /dev/null; then echo "Installation won't work. Please close $lock first then try again."; - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Warning - Y PPA Manager" --text="\n\n Selected action won't work. \n\n Please close / wait for $lock to finish and try again! \n" --button="gtk-ok:0" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Warning - Y PPA Manager" --text="\n\n Selected action won't work. \n\n Please close / wait for $lock to finish and try again! \n" --button="gtk-ok:0" exit fi done @@ -179,7 +179,7 @@ dupes_to_remove=$(cat /tmp/.dupes_to_remove) if [[ -s /tmp/.rmdups ]]; then - yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Duplicate PPA sources detected" --text=" You have $dupes_number duplicate PPA source list file(s) " --button="gtk-cancel:1" --button="Remove duplicates:0" --button="Show duplicates:2" + yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Duplicate PPA sources detected" --text=" You have $dupes_number duplicate PPA source list file(s) " --button="gtk-cancel:1" --button="Remove duplicates:0" --button="Show duplicates:2" ret=$? if [[ $ret -eq 0 ]]; then chmod +x /tmp/.rmdups @@ -187,7 +187,7 @@ su $loggeduser -s /bin/bash -c "${DBUS} notify-send -h int:transient:1 -t 10000 -u normal --icon=dialog-ok \"Y PPA Manager - Done\" \"Successfully removed duplicates\"" elif [[ $ret -eq 2 ]]; then - yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Duplicate PPA sources" --text="$dupes_show \n\n\n The following PPA source(s) will be removed: \n$dupes_to_remove" --button="gtk-cancel:1" --button="Remove duplicates:0" + yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Duplicate PPA sources" --text="$dupes_show \n\n\n The following PPA source(s) will be removed: \n$dupes_to_remove" --button="gtk-cancel:1" --button="Remove duplicates:0" if [[ $? -eq 0 ]]; then chmod +x /tmp/.rmdups sh /tmp/.rmdups && rm /tmp/.dupes_to_remove /tmp/.dupes_show /tmp/.rmdups > /dev/null 2>&1 @@ -213,7 +213,7 @@ # checkAPT - ADD_PPA=`yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --entry --title="Add a PPA" --text="Enter a PPA to add (e.g.: ppa:webupd8team/ghtumb)\n" --entry-label="PPA:"` + ADD_PPA=`yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --entry --title="Add a PPA" --text="Enter a PPA to add (e.g.: ppa:webupd8team/ghtumb)\n" --entry-label="PPA:"` if [[ $? -eq 0 ]]; then @@ -238,7 +238,7 @@ checksourceslist=`cat /etc/apt/sources.list | grep -i "deb http://ppa.launchpad.net/$username/$ppaname/ubuntu"` if [[ -e /etc/apt/sources.list.d/"$ppafilename1".list || -e /etc/apt/sources.list.d/"$ppafilename2"-$UBUVER\.list || $checkinppaa || $checksourceslist ]]; then - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" The ppa:$ADD_PPA_NO_SPACES is already \n added on your system. " --button="gtk-ok:0" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" The ppa:$ADD_PPA_NO_SPACES is already \n added on your system. " --button="gtk-ok:0" add_a_PPA fi #done check @@ -264,7 +264,7 @@ fi else - yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error" --text=" The PPA you've entered is not valid \n Please enter a valid PPA (e.g.: ppa:webupd8/gthumb) " --button="gtk-ok:0" + yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error" --text=" The PPA you've entered is not valid \n Please enter a valid PPA (e.g.: ppa:webupd8/gthumb) " --button="gtk-ok:0" add_a_PPA fi else @@ -334,7 +334,7 @@ list_sourcesNAMES=$(cat /tmp/.y_ppalist.list) # list_sourcesNAMES=`cat /tmp/.non_disabled.list` - LIST_PPA_PACKAGES=$(yad --always-print-result --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --separator="" --list --width=600 --height=500 --title="Manage PPAs - Y PPA Manager" --search-column="1" --regex-search --text="Select the PPA from the list below (only non-disabled PPAs are listed):" --button="Remove:4" --button="Purge:5" --button="Update:2" --button="Edit source:3" --button="List packages:0" --button="Close:6" --column "PPA" --list $list_sourcesNAMES) + LIST_PPA_PACKAGES=$(yad --center --always-print-result --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --separator="" --list --width=600 --height=500 --title="Manage PPAs - Y PPA Manager" --search-column="1" --regex-search --text="Select the PPA from the list below (only non-disabled PPAs are listed):" --button="Remove:4" --button="Purge:5" --button="Update:2" --button="Edit source:3" --button="List packages:0" --button="Close:6" --column "PPA" --list $list_sourcesNAMES) ret=$? echo LIST_PPA_PACKAGES $LIST_PPA_PACKAGES @@ -375,7 +375,7 @@ #ZENITY_PPA_PACKAGES="$PPA_PACKAGES ($PPA_VERSIONS)" - LIST_PACKAGES=`yad --class="Y-PPA-Manager" --name="Y PPA Manager" --always-print-result --multiple --separator=" " --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=500 --height=250 --title="Packages - Y PPA Manager" --search-column="1" --regex-search --button="Back:1" --button="Install:2" --button="Copy PPA link to clipboard:0" --text=" Packages in "$ppa_name" PPA (for your Ubuntu version only!): " --column="Package (version)" --list $PPA_SEARCH_LIST_RESULTS2` + LIST_PACKAGES=`yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --always-print-result --multiple --separator=" " --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=500 --height=250 --title="Packages - Y PPA Manager" --search-column="1" --regex-search --button="Back:1" --button="Install:2" --button="Copy PPA link to clipboard:0" --text=" Packages in "$ppa_name" PPA (for your Ubuntu version only!): " --column="Package (version)" --list $PPA_SEARCH_LIST_RESULTS2` ret=$? if [[ $ret -eq 0 ]]; then @@ -394,7 +394,7 @@ elif [[ $ret -eq 2 ]]; then packagestoinstall=$(echo $LIST_PACKAGES | sed -e 's/([^)]*)//g' -e 's/LIST_PACKAGES//g' -e 's/ / /g' -e 's/ / /g' -e 's/^ //g' -e 's/ $//g') packagestoinstall_with_comma=$(echo $packagestoinstall | sed -e 's/ /, /g') - INSTALL_ONLY=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to install: \n $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` + INSTALL_ONLY=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to install: \n $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` if [[ $? -eq 0 ]]; then python /usr/share/pyshared/y-ppa-manager/install_package.py $packagestoinstall > /dev/null 2>&1 CLEARTEMP @@ -463,7 +463,7 @@ ubuntudist=$(echo "$stripppa" | cut -f2 -d ' ' | sed -e 's/(//g' -e 's/)//g') fullppa_stripdist=$(echo "$LIST_PPA_PACKAGES" | sed -e 's/ (.*//g') - yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Confirm" --text=" Are you sure you want to purge \n the "$fullppa_stripdist" PPA? " --button="Cancel:1" --button="OK:0" + yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Confirm" --text=" Are you sure you want to purge \n the "$fullppa_stripdist" PPA? " --button="Cancel:1" --button="OK:0" if [[ $? -eq 0 ]]; then checkAPT testConnection @@ -509,7 +509,7 @@ username=$(cat /tmp/.yppa_username) homedir=$(cat /tmp/.yppa_home) -Y_PPA_BACKUP=`yad --class="Y-PPA-Manager" --name="Y PPA Manager" --file-selection --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --filename=$homedir/repositories.backup-$b_name.tar.gz --save --button="Cancel:1" --button="Save:0" --width=700 --height=500 --title="Save the backup..."` +Y_PPA_BACKUP=`yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --file-selection --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --filename=$homedir/repositories.backup-$b_name.tar.gz --save --button="Cancel:1" --button="Save:0" --width=700 --height=500 --title="Save the backup..."` ret=$? if [[ $ret -eq 0 ]]; then @@ -539,7 +539,7 @@ #b_name=$(date +%F-%H%M) -#Y_PPA_BACKUP=`yad --class="Y-PPA-Manager" --name="Y PPA Manager" --file-selection --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --filename=/home/$ON_USER/full-sources.backup-$b_name.tar.gz --save --button="Cancel:1" --button="Save:0" --width=700 --height=500 --title="Save the backup..."` +#Y_PPA_BACKUP=`yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --file-selection --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --filename=/home/$ON_USER/full-sources.backup-$b_name.tar.gz --save --button="Cancel:1" --button="Save:0" --width=700 --height=500 --title="Save the backup..."` #if [[ $? -eq 0 ]]; then # cd /etc/apt/ @@ -559,7 +559,7 @@ function y_ppa_restore() { username=`who | grep "$DISPLAY" | cut -d ' ' -f 1 | tail -1` homedir=`awk -F: -v v="$username" '{if ($1==v) print $6}' /etc/passwd` -Y_PPA_BACKUP=`yad --class="Y-PPA-Manager" --name="Y PPA Manager" --file-selection --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --save --filename=$homedir/ --button="Cancel:1" --button="Restore:0" --width=700 --height=500 --title="Select backup to restore..."` +Y_PPA_BACKUP=`yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --file-selection --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --save --filename=$homedir/ --button="Cancel:1" --button="Restore:0" --width=700 --height=500 --title="Select backup to restore..."` if [[ $? -eq 0 ]]; then tar zxvf "$Y_PPA_BACKUP" -C /etc/apt/sources.list.d/ @@ -595,7 +595,7 @@ function y_ppa_import_gpg_keys() { - Y_UPGRADE_PPA=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" Will try to import all missing GPG repository keys. \n This make take a a while so please be patient. \n\n Click OK to continue " --button="gtk-cancel:1" --button="gtk-ok:0"` + Y_UPGRADE_PPA=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" Will try to import all missing GPG repository keys. \n This make take a a while so please be patient. \n\n Click OK to continue " --button="gtk-cancel:1" --button="gtk-ok:0"` ret=$? if [[ $ret -eq 0 ]]; then launchpad-getkeys @@ -611,7 +611,7 @@ function y_ppa_fix_gpg_badsig() { - Y_UPGRADE_PPA=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" Will try to fix all GPG BADSIG errors. \n This make take a a while so please be patient. \n\n Click OK to continue " --button="gtk-cancel:1" --button="gtk-ok:0"` + Y_UPGRADE_PPA=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" Will try to fix all GPG BADSIG errors. \n This make take a a while so please be patient. \n\n Click OK to continue " --button="gtk-cancel:1" --button="gtk-ok:0"` ret=$? if [[ $ret -eq 0 ]]; then fix_gpg_badsig @@ -625,7 +625,7 @@ } #function y_full_restore() { -#Y_PPA_BACKUP=`yad --file-selection --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --save --button="Cancel:1" --button="Restore:0" --width=700 --height=500 --title="Select a full backup to restore..."` +#Y_PPA_BACKUP=`yad --center --file-selection --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --save --button="Cancel:1" --button="Restore:0" --width=700 --height=500 --title="Select a full backup to restore..."` #if [[ $? -eq 0 ]]; then # gksu -S -m "Y PPA Manager requires admin privileges for this task" "tar -xvf "$Y_PPA_BACKUP" -C /etc/apt/" @@ -640,7 +640,7 @@ function advanced_options() { -Y_ADVANCED=`yad --list --no-headers --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --column="" "Scan and remove duplicate PPAs" "Try to import all missing GPG keys" "Try to fix all GPG BADSIG errors" "Backup repositories" "Restore repositories backup" "Re-enable working PPAs after Ubuntu upgrade" "Update release name in working PPAs" --width=350 --height=270 --title="Advanced - Y PPA Manager" --button="Close:1" --button="gtk-ok:0"` +Y_ADVANCED=`yad --center --list --no-headers --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --column="" "Scan and remove duplicate PPAs" "Try to import all missing GPG keys" "Try to fix all GPG BADSIG errors" "Backup repositories" "Restore repositories backup" "Re-enable working PPAs after Ubuntu upgrade" "Update release name in working PPAs" --width=350 --height=270 --title="Advanced - Y PPA Manager" --button="Close:1" --button="gtk-ok:0"` Y_ADVANCED_fix=`echo "$Y_ADVANCED" | sed -e "s/|//"` @@ -730,9 +730,9 @@ #temporarely_disabled fi -#temporarely_disabled Y_SETTINGS=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --field="PPA-Purge:CB" $ppa_purge_opt --field="Display PPA rankings for deep search (slow):CB" $rankings_opt --field="Ubuntu version*" "$current_ubuntu_version" --field="Downloads folder:DIR" "$current_downloads_folder" --text=" * Linux Mint users - enter the corresponding Ubuntu version " --button="Reset to default:2" --button="gtk-cancel:1" --button="gtk-ok:0"` +#temporarely_disabled Y_SETTINGS=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --field="PPA-Purge:CB" $ppa_purge_opt --field="Display PPA rankings for deep search (slow):CB" $rankings_opt --field="Ubuntu version*" "$current_ubuntu_version" --field="Downloads folder:DIR" "$current_downloads_folder" --text=" * Linux Mint users - enter the corresponding Ubuntu version " --button="Reset to default:2" --button="gtk-cancel:1" --button="gtk-ok:0"` -Y_SETTINGS=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Settings - Y PPA Manager" --field="PPA-Purge:CB" $ppa_purge_opt --field="Ubuntu Indicator:CB" $indicator_opt --field="Ubuntu version*" "$current_ubuntu_version" --text=" * Linux Mint, elementary OS users - enter the corresponding Ubuntu version " --button="Reset to default:2" --button="gtk-cancel:1" --button="gtk-ok:0"` +Y_SETTINGS=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Settings - Y PPA Manager" --field="PPA-Purge:CB" $ppa_purge_opt --field="Ubuntu Indicator:CB" $indicator_opt --field="Ubuntu version*" "$current_ubuntu_version" --text=" * Linux Mint, elementary OS users - enter the corresponding Ubuntu version " --button="Reset to default:2" --button="gtk-cancel:1" --button="gtk-ok:0"` ret=$? @@ -780,7 +780,7 @@ elif [[ $Y_indicator = "enabled" ]]; then rm /etc/xdg/autostart/y-ppa-indicator.desktop > /dev/null 2>&1 - yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" The indicator will be started the \n next time you run Y PPA Manager " --button="Ok:1" + yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --text=" The indicator will be started the \n next time you run Y PPA Manager " --button="Ok:1" elif [[ $Y_indicator = "disabled" ]]; then killall y-ppa-indicator & @@ -796,7 +796,7 @@ # gksu -S -m "Y PPA Manager requires admin privileges for this task" cp /tmp/.y-ppa-manager.conf /etc/y-ppa-manager.conf # rm /tmp/.y-ppa-manager.conf else - yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error" --text=" The Ubuntu version you've entered is not valid \n Please enter one of the following versions: \n trusty, saucy, raring, quantal, precise, oneiric, natty or lucid (in lowercase) " --button="gtk-ok:0" + yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error" --text=" The Ubuntu version you've entered is not valid \n Please enter one of the following versions: \n trusty, saucy, raring, quantal, precise, oneiric, natty or lucid (in lowercase) " --button="gtk-ok:0" y_ppa_settings fi @@ -843,7 +843,7 @@ help_dialog() { - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Help - Y PPA Manager" --width="500" --height="400" --text-info --wrap --filename="/usr/share/y-ppa-manager/y_ppa_man_help" --button="Close:1" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Help - Y PPA Manager" --width="500" --height="400" --text-info --wrap --filename="/usr/share/y-ppa-manager/y_ppa_man_help" --button="Close:1" exit @@ -857,7 +857,7 @@ #ppa_manager_run() #{ -#MANAGE_PPA=$(yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --separator=" " --list --width=450 --height=250 --title="Y PPA Manager" --button="Help:3" --button="Exit:1" --button="Select:0" --text="Select an action:" --column=" " --no-headers "Add PPA" "Remove PPA" "Purge PPA" "List packages in a PPA on your computer" "Search packages in all Launchpad PPAs") +#MANAGE_PPA=$(yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --separator=" " --list --width=450 --height=250 --title="Y PPA Manager" --button="Help:3" --button="Exit:1" --button="Select:0" --text="Select an action:" --column=" " --no-headers "Add PPA" "Remove PPA" "Purge PPA" "List packages in a PPA on your computer" "Search packages in all Launchpad PPAs") #rett=$? diff -Nru y-ppa-manager-0.9.9.2/y-ppa-manager y-ppa-manager-2014.04.17/y-ppa-manager --- y-ppa-manager-0.9.9.2/y-ppa-manager 2013-11-13 11:52:36.000000000 +0000 +++ y-ppa-manager-2014.04.17/y-ppa-manager 2014-01-30 11:25:31.000000000 +0000 @@ -7,9 +7,9 @@ function Y_MAIN_DIALOG() { if [[ $(version $GTKVERS) < $(version 3.8) ]]; then - Y_RUN=$(yad --icons --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --item-width="182" --single-click --read-dir="/usr/share/y-ppa-manager/desktopfiles" --width="435" --height="380" --title="Y PPA Manager" --button="Help:0" --button="Close:1") + Y_RUN=$(yad --center --icons --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --item-width="182" --single-click --read-dir="/usr/share/y-ppa-manager/desktopfiles" --width="435" --height="380" --title="Y PPA Manager" --button="Help:0" --button="Close:1") else - Y_RUN=$(yad --icons --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --single-click --read-dir="/usr/share/y-ppa-manager/desktopfiles" --width="460" --height="380" --title="Y PPA Manager" --button="Help:0" --button="Close:1") + Y_RUN=$(yad --center --icons --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --single-click --read-dir="/usr/share/y-ppa-manager/desktopfiles" --width="460" --height="380" --title="Y PPA Manager" --button="Help:0" --button="Close:1") fi ret=$? if [[ $ret -eq 0 ]]; then diff -Nru y-ppa-manager-0.9.9.2/y-ppa-search y-ppa-manager-2014.04.17/y-ppa-search --- y-ppa-manager-0.9.9.2/y-ppa-search 2013-11-27 14:25:21.000000000 +0000 +++ y-ppa-manager-2014.04.17/y-ppa-search 2014-03-14 09:22:08.000000000 +0000 @@ -101,12 +101,12 @@ function checkAPT() { sleep 1 - for lock in synaptic update-manager software-center apt-get dpkg aptitude + for lock in synaptic update-manager software-center apt-get "dpkg " aptitude do - if ps -U root -u root u | grep $lock | grep -v grep > /dev/null; + if ps -U root -u root u | grep "$lock" | grep -v grep > /dev/null; then echo "Installation won't work. Please close $lock first then try again."; - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Warning - Y PPA Manager" --text="\n\n Selected action won't work. \n\n Please close / wait for $lock to finish and try again! \n" --button="OK:4" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Warning - Y PPA Manager" --text="\n\n Selected action won't work. \n\n Please close / wait for $lock to finish and try again! \n" --button="OK:4" search_ppa_ppa_results fi done @@ -152,7 +152,7 @@ if [[ -e /etc/apt/sources.list.d/"$ppafilename1".list || -e /etc/apt/sources.list.d/"$ppafilename2"-$UBUVER\.list || $checkinppaa || $checksourceslist ]]; then echo "yes then wtf" - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" The ppa:$PPA_TO_ADD is already \n added on your system. " --button="gtk-ok:0" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" The ppa:$PPA_TO_ADD is already \n added on your system. " --button="gtk-ok:0" search_ppa_ppa_results fi #done check @@ -200,7 +200,7 @@ if [[ ! -s /tmp/.Packages ]]; then - yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" This PPA does not have any packages for your Ubuntu \n version or the PPA is empty " + yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" This PPA does not have any packages for your Ubuntu \n version or the PPA is empty " search_ppa_ppa_results else PPA_PACKAGES=`grep "^Package: " .Packages | sed -e 's/Package://g' > .packagename` @@ -212,7 +212,7 @@ PPA_SEARCH_LIST_RESULTS=`cat .package_search_list_results` ppa_name=`echo "$SEARCH_LIST_PACKAGES" | sed -e 's/|\|(.*//'` - LIST_PACKAGES=`yad --always-print-result --multiple --separator=" " --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=450 --height=400 --search-column="1" --regex-search --title="Packages - Y PPA Manager" --text=" Packages in "$ppa_name" PPA (for Ubuntu $PPA_SEARCH_DIST only): " --column "Package (version)" --button="Back:2" --button="Download selected package(s):1" --button="Install:0" --button="Copy PPA link to clipboard:3" --list $PPA_SEARCH_LIST_RESULTS` + LIST_PACKAGES=`yad --center --always-print-result --multiple --separator=" " --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=450 --height=400 --search-column="1" --regex-search --title="Packages - Y PPA Manager" --text=" Packages in "$ppa_name" PPA (for Ubuntu $PPA_SEARCH_DIST only): " --column "Package (version)" --button="Back:2" --button="Download selected package(s):1" --button="Install:0" --button="Copy PPA link to clipboard:3" --list $PPA_SEARCH_LIST_RESULTS` ret=$? # echo RET $ret @@ -234,7 +234,7 @@ elif [[ $ret -eq 1 ]]; then - DOWNLOAD_DIR=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --field="Select downloads folder:DIR" --button="gtk-cancel:1" --button="gtk-ok:0"` + DOWNLOAD_DIR=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --field="Select downloads folder:DIR" --button="gtk-cancel:1" --button="gtk-ok:0"` ret=$? if [[ $ret -eq 0 ]]; then cd $(echo $DOWNLOAD_DIR | sed -e 's/|$//') @@ -280,7 +280,7 @@ checksourceslist=`cat /etc/apt/sources.list | grep -i "deb http://ppa.launchpad.net/$username/$ppaname/ubuntu"` if [[ -e /etc/apt/sources.list.d/"$ppafilename1".list || -e /etc/apt/sources.list.d/"$ppafilename2"-$UBUVER\.list || $checkinppaa || $checksourceslist ]]; then - INSTALL_ONLY=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to install: \n $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` + INSTALL_ONLY=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to install: \n $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` if [[ $? -eq 0 ]]; then update-ppa ppa:"$ppa_name" && python /usr/share/pyshared/y-ppa-manager/install_package.py $packagestoinstall > /dev/null 2>&1 @@ -291,7 +291,7 @@ fi else - ADD_AND_INSTALL=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to add ppa:"$ppa_name" \n and install: $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` + ADD_AND_INSTALL=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to add ppa:"$ppa_name" \n and install: $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` if [[ $? -eq 0 ]]; then if [[ `lsb_release -cs` = "olivia" ]]; then @@ -336,20 +336,20 @@ { rm /tmp/+ppas* > /dev/null 2>&1; - SEARCH_PPA=`yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Search - Y PPA Manager" --auto-kill --text="\n Search in all the Launchpad PPAs. Unless you use the \n basic search, you must enter the exact package name! \n" --button="gtk-cancel:1" --form --field="Search for:" --field="Basic search (less acurate, displays less info\nbut is faster):CHK" --button="gtk-ok:0"` + SEARCH_PPA=`yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Search - Y PPA Manager" --auto-kill --text="\n Search in all the Launchpad PPAs. Unless you use the \n basic search, you must enter the exact package name! \n" --button="gtk-cancel:1" --form --field="Search for:" --field="Basic search (less acurate, displays less info\nbut is faster):CHK" --button="gtk-ok:0"` if [[ $? -eq 0 ]]; then checkbox=`echo $SEARCH_PPA | grep "|FALSE|"` SEARCH_PPA=`echo $SEARCH_PPA | sed -e 's/|.*|//' | tr '[:upper:]' '[:lower:]'` if [[ ! $checkbox ]]; then #regular search: - [[ ! $SEARCH_PPA ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" You did not enter anything \n to search for. " --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog + [[ ! $SEARCH_PPA ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" You did not enter anything \n to search for. " --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog - [[ ! -z "${SEARCH_PPA//[a-zA-Z0-9-. ]}" ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Your search is not valid! \n\n (all non-alphanumeric characters except \"-\" and \n space are disallowed). \n" --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog + [[ ! -z "${SEARCH_PPA//[a-zA-Z0-9-. ]}" ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Your search is not valid! \n\n (all non-alphanumeric characters except \"-\" and \n space are disallowed). \n" --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog -#temporarely_disabled [[ -e /tmp/.already_searching ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Y PPA Manager is already performing a search. \n Please wait for your previous search to finish and try again. \n\n\n Tip: if your search takes too long, disable PPA Rankings \n in Y PPA Manager settings or use the regular search " --button="gtk-ok:0" && exit 0 - [[ -e /tmp/.already_searching ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Y PPA Manager is already performing a search. \n Please wait for your previous search to finish and try again. " --button="gtk-ok:0" && exit 0 +#temporarely_disabled [[ -e /tmp/.already_searching ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Y PPA Manager is already performing a search. \n Please wait for your previous search to finish and try again. \n\n\n Tip: if your search takes too long, disable PPA Rankings \n in Y PPA Manager settings or use the regular search " --button="gtk-ok:0" && exit 0 + [[ -e /tmp/.already_searching ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Y PPA Manager is already performing a search. \n Please wait for your previous search to finish and try again. " --button="gtk-ok:0" && exit 0 if [[ "$SEARCH_PPA" && -z "${SEARCH_PPA//[a-zA-Z0-9-. ]}" && ! -e /tmp/.already_searching ]]; then @@ -360,7 +360,7 @@ wget --no-check-certificate -q https://launchpad.net/ubuntu/+ppas?name_filter="$SEARCH_PPA" noresults=`grep "No matching Personal" +ppas\?name_filter\="$SEARCH_PPA"` # echo noresults: $noresults - [[ $noresults ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" Your search did not return any results \n Please try a new search " --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog + [[ $noresults ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" Your search did not return any results \n Please try a new search " --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog #ppa names: searched_ppa_names=`grep -A2 ppa_batch_row +ppas\?name_filter\="$SEARCH_PPA" | grep href | cut -c 18- | cut -d ">" -f 2 | sed -e 's/<\/a//g' -e 's/$/)/g' -e 's/^/(/g' > .searched_ppa_names; cat .searched_ppa_names` @@ -401,15 +401,15 @@ #advanced search else - [[ ! $SEARCH_PPA ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error" --text=" You did not enter anything \n to search for " --button="gtk-ok:0" && rm /tmp/.already_searching && search_ppa_dialog + [[ ! $SEARCH_PPA ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error" --text=" You did not enter anything \n to search for " --button="gtk-ok:0" && rm /tmp/.already_searching && search_ppa_dialog - [[ ! -z "${SEARCH_PPA//[a-zA-Z0-9-.]}" ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Your search is not valid! \n\n Please enter an exact package name or use \n the basic search. All non-alphanumeric \n characters except \"-\" are disallowed. \n" --button="gtk-ok:0" && rm /tmp/.already_searching && search_ppa_dialog + [[ ! -z "${SEARCH_PPA//[a-zA-Z0-9-.]}" ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Your search is not valid! \n\n Please enter an exact package name or use \n the basic search. All non-alphanumeric \n characters except \"-\" are disallowed. \n" --button="gtk-ok:0" && rm /tmp/.already_searching && search_ppa_dialog # testthesearch=`echo $SEARCH_PPA | cut -d ' ' -f1` -# [[ $testthesearch ]] && yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error" --text=" Only test for one package \n No spaces or extra characters allowed " --button="gtk-ok:0" && search_ppa_dialog +# [[ $testthesearch ]] && yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error" --text=" Only test for one package \n No spaces or extra characters allowed " --button="gtk-ok:0" && search_ppa_dialog -#temporarely_disabled [[ -e /tmp/.already_searching ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Y PPA Manager is already performing a search. \n Please wait for your previous search to finish and try again. \n\n\n Tip: if your search takes too long, disable PPA Rankings \n in Y PPA Manager settings or use the regular search " --button="gtk-ok:0" && exit 0 - [[ -e /tmp/.already_searching ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Y PPA Manager is already performing a search. \n Please wait for your previous search to finish and try again. " --button="gtk-ok:0" && exit 0 +#temporarely_disabled [[ -e /tmp/.already_searching ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Y PPA Manager is already performing a search. \n Please wait for your previous search to finish and try again. \n\n\n Tip: if your search takes too long, disable PPA Rankings \n in Y PPA Manager settings or use the regular search " --button="gtk-ok:0" && exit 0 + [[ -e /tmp/.already_searching ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" Y PPA Manager is already performing a search. \n Please wait for your previous search to finish and try again. " --button="gtk-ok:0" && exit 0 if [[ "$SEARCH_PPA" && -z "${SEARCH_PPA//[a-zA-Z0-9-.]}" && ! -e /tmp/.already_searching ]]; then @@ -427,7 +427,7 @@ wget --no-check-certificate -q https://launchpad.net/ubuntu/+ppas?name_filter="$SEARCH_PPA" noresults=`grep "No matching Personal" +ppas\?name_filter\="$SEARCH_PPA"` # echo noresults: $noresults - [[ $noresults ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" Your search did not return any results \n Please try a new search " --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog + [[ $noresults ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" Your search did not return any results \n Please try a new search " --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog #ppa names: searched_ppa_names=`grep -A2 ppa_batch_row +ppas\?name_filter\="$SEARCH_PPA" | grep href | cut -c 18- | cut -d ">" -f 2 | sed -e 's/<\/a//g' -e 's/$/)/g' -e 's/^/(/g' > .searched_ppa_names; cat .searched_ppa_names` @@ -579,7 +579,7 @@ advancedsearch=`cat .y_advanced_search_packages` # noresults2=`grep "No matching Personal" +ppas\?name_filter\="$SEARCH_PPA"` # echo noresults: $noresults - [[ ! $advancedsearch ]] && yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" Your search did not return any results! \n\n Did you enter an exact package name? \n That is required unless you use the basic search! \n\n Please try a new search... " --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog + [[ ! $advancedsearch ]] && yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" Your search did not return any results! \n\n Did you enter an exact package name? \n That is required unless you use the basic search! \n\n Please try a new search... " --button="gtk-ok:0" && rm /tmp/.already_searching > /dev/null 2>&1 && search_ppa_dialog search_advanced_ppa_ppa_results @@ -605,7 +605,7 @@ IFS=$'\n' - SEARCH_LIST_PACKAGES=`yad --always-print-result --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=750 --height=400 --title="PPA Search - Y PPA Manager" --search-column="1" --regex-search --text="$SEARCH_PPA can be found in the following PPAs:" --column="PPA (description)" --column="PPA Status" --button="Close:2" --button="Search again:3" --button="Add selected PPA:1" --button="List packages:0" --list $list_search_results` + SEARCH_LIST_PACKAGES=`yad --center --always-print-result --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=750 --height=400 --title="PPA Search - Y PPA Manager" --search-column="1" --regex-search --text="$SEARCH_PPA can be found in the following PPAs:" --column="PPA (description)" --column="PPA Status" --button="Close:2" --button="Search again:3" --button="Add selected PPA:1" --button="List packages:0" --list $list_search_results` ret2=$? # echo SEARCH_LIST_PACKAGES "$SEARCH_LIST_PACKAGES" # echo ret $ret2 @@ -648,7 +648,7 @@ checksourceslist=`cat /etc/apt/sources.list | grep -i "deb http://ppa.launchpad.net/$username/$ppaname/ubuntu"` if [[ -e /etc/apt/sources.list.d/"$ppafilename1".list || -e /etc/apt/sources.list.d/"$ppafilename2"-$UBUVER\.list || $checkinppaa || $checksourceslist ]]; then - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" The ppa:$PPA_TO_ADD is already \n added on your system. " --button="gtk-ok:0" + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="Error - Y PPA Manager" --text=" The ppa:$PPA_TO_ADD is already \n added on your system. " --button="gtk-ok:0" search_advanced_ppa_ppa_results fi #done check @@ -699,7 +699,7 @@ if [[ ! -s /tmp/.Packages ]]; then - yad --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" This PPA does not have any packages for your Ubuntu \n version or the PPA is empty " + yad --center --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --title="No packages" --text=" This PPA does not have any packages for your Ubuntu \n version or the PPA is empty " search_advanced_ppa_ppa_results else PPA_PACKAGES=`grep "^Package: " .Packages | sed -e 's/Package://g' > .packagename` @@ -711,7 +711,7 @@ PPA_SEARCH_LIST_RESULTS=`cat .package_search_list_results` ppa_name=`echo "$SEARCH_ADVANCED_LIST_PACKAGES" | sed -e 's/.*|ppa:/ppa:/' -e 's/|//' -e 's/Already present|//g' -e 's/Not present|//g'` - LIST_PACKAGES=`yad --always-print-result --multiple --separator=" " --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=450 --height=400 --search-column="1" --regex-search --title="Packages - Y PPA Manager" --text=" Packages in "$ppa_name" PPA (for Ubuntu $PPA_SEARCH_DIST only): " --column "Package (version)" --button="Back:2" --button="Download selected package(s):1" --button="Copy PPA link to clipboard:3" --button="Install:0" --list $PPA_SEARCH_LIST_RESULTS` + LIST_PACKAGES=`yad --center --always-print-result --multiple --separator=" " --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=450 --height=400 --search-column="1" --regex-search --title="Packages - Y PPA Manager" --text=" Packages in "$ppa_name" PPA (for Ubuntu $PPA_SEARCH_DIST only): " --column "Package (version)" --button="Back:2" --button="Download selected package(s):1" --button="Copy PPA link to clipboard:3" --button="Install:0" --list $PPA_SEARCH_LIST_RESULTS` ret=$? # echo RET $ret @@ -731,7 +731,7 @@ elif [[ $ret -eq 1 ]]; then - DOWNLOAD_DIR=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --field="Select downloads folder:DIR" --button="gtk-cancel:1" --button="gtk-ok:0"` + DOWNLOAD_DIR=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --field="Select downloads folder:DIR" --button="gtk-cancel:1" --button="gtk-ok:0"` ret=$? if [[ $ret -eq 0 ]]; then cd $(echo $DOWNLOAD_DIR | sed -e 's/|$//') @@ -781,7 +781,7 @@ if [[ -e /etc/apt/sources.list.d/"$ppafilename1".list || -e /etc/apt/sources.list.d/"$ppafilename2"-$UBUVER\.list || $checkinppaa || $checksourceslist ]]; then - INSTALL_ONLY=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to install: \n $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` + INSTALL_ONLY=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to install: \n $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` if [[ $? -eq 0 ]]; then update-ppa ppa:"$PPA_TO_ADD" && python /usr/share/pyshared/y-ppa-manager/install_package.py $packagestoinstall > /dev/null 2>&1 @@ -793,7 +793,7 @@ else - ADD_AND_INSTALL=`yad --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to add ppa:"$PPA_TO_ADD" \n and install: $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` + ADD_AND_INSTALL=`yad --center --form --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --title="Confirmation - Y PPA Manager" --text=" You are about to add ppa:"$PPA_TO_ADD" \n and install: $packagestoinstall_with_comma \n\n Proceed? " --button="Cancel:1" --button="Ok:0"` if [[ $? -eq 0 ]]; then if [[ `lsb_release -cs` = "olivia" ]]; then @@ -846,11 +846,11 @@ if [[ $RANKINGS = "true" ]]; then - SEARCH_ADVANCED_LIST_PACKAGES=`yad --always-print-result --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=700 --height=450 --title="PPA Search - Y PPA Manager" --text=" "$MSG" " --search-column="3" --regex-search --column="Package" --column="Version" --column="PPA" --column="PPA Rank" --button="Close:2" --button="Search again:3" --button="Add selected PPA:1" --button="List packages:0" --list $advancedsearch` + SEARCH_ADVANCED_LIST_PACKAGES=`yad --center --always-print-result --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=700 --height=450 --title="PPA Search - Y PPA Manager" --text=" "$MSG" " --search-column="3" --regex-search --column="Package" --column="Version" --column="PPA" --column="PPA Rank" --button="Close:2" --button="Search again:3" --button="Add selected PPA:1" --button="List packages:0" --list $advancedsearch` elif [[ $RANKINGS = "false" ]]; then - SEARCH_ADVANCED_LIST_PACKAGES=`yad --always-print-result --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=700 --height=450 --title="PPA Search - Y PPA Manager" --text=" "$MSG" " --search-column="3" --regex-search --column="Package" --column="Version" --column="PPA" --column="PPA status" --button="Close:2" --button="Search again:3" --button="Add selected PPA:1" --button="List packages:0" --list $advancedsearch` + SEARCH_ADVANCED_LIST_PACKAGES=`yad --center --always-print-result --class="Y-PPA-Manager" --name="Y PPA Manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --width=700 --height=450 --title="PPA Search - Y PPA Manager" --text=" "$MSG" " --search-column="3" --regex-search --column="Package" --column="Version" --column="PPA" --column="PPA status" --button="Close:2" --button="Search again:3" --button="Add selected PPA:1" --button="List packages:0" --list $advancedsearch` fi ret2=$? @@ -881,7 +881,7 @@ #ppa_add_or_display_contents() #{ -#displayyadform=`yad --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --text="Select an action:" --button="List the packages in this PPA:0" --button="Add this PPA:1"` +#displayyad --centerform=`yad --center --class="y-ppa-manager" --window-icon="/usr/share/icons/hicolor/128x128/apps/y-ppa-manager.png" --form --text="Select an action:" --button="List the packages in this PPA:0" --button="Add this PPA:1"` #if [ $? -eq 0 ]; then #search_ppa_packages_results_dialog