From a6a97cc9319b933ef25ca2d49e0c75f92c04983b Mon Sep 17 00:00:00 2001 From: Mason Hock <mason@masonhock.com> Date: Thu, 5 Sep 2019 12:49:12 -0700 Subject: [PATCH 1/4] update location of commands --- helpers/make-command-not-found | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/helpers/make-command-not-found b/helpers/make-command-not-found index 58199eb3..72fe3291 100644 --- a/helpers/make-command-not-found +++ b/helpers/make-command-not-found @@ -21,11 +21,14 @@ VERSION=1 . ./config +rm -rf CommandNotFound/db/dists/$UPSTREAM*/multiverse +rm -rf CommandNotFound/db/dists/$UPSTREAM*/restricted + for word in restricted nonfree multiverse aee afio app-install-data-commercial app-install-data-partner b43-fwcutter bcm43xx-fwcutter chromium-codecs-ffmpeg chromium-browser d4x easycrypt gdecrypt envyng-core envyng-gtk envyng-qt fglrx-installer freesci gfxboot-theme-ubuntu pitfdll helix-player isdnactivecards isdnutils ivman jockey mame mesademos moon ndisgtk ndiswrapper nikto nvidia-common nvidia-graphics-drivers nvidia-graphics-drivers-173 nvidia-graphics-drivers-180 nvidia-graphics-drivers-71 nvidia-graphics-drivers-96 nvidia-settings nvidia-xconfig ophcrack rman simutrans-pak128.britain simutrans simutrans-pak64 scribus-ng-doc software-center starfighter tatan testdrive unetbootin ubuntuone-client ubuntu-restricted-extras rhythmbox-ubuntuone-music-store seamonkey ubuntuone-dev-tools libubuntuone ubuntuone-storage-protocol user-mode-linux user-mode-linux-doc vrms 9wm 9menu w9wm acetoneiso a2ps-perl-ja bibletime bibledit bible-kjv winetricks ; do - /bin/sed "/$word/d" -i ./UnifiedDataExtractor/scan.data + /bin/sed "/$word/d" -i CommandNotFound/db/dists/$UPSTREAM*/*/cnf/Commands-* done -sed 's/|universe|/|main|/' -i ./UnifiedDataExtractor/scan.data +#sed 's/|universe|/|main|/' -i ./UnifiedDataExtractor/scan.data changelog "Removed references to non-free software" -- GitLab From ab2f2c2931ad5ba1c547da78f68421485406e9e9 Mon Sep 17 00:00:00 2001 From: Mason Hock <mason@masonhock.com> Date: Thu, 5 Sep 2019 14:51:13 -0700 Subject: [PATCH 2/4] update for new location/format of commands --- helpers/make-command-not-found | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-command-not-found b/helpers/make-command-not-found index 72fe3291..7b153ff2 100644 --- a/helpers/make-command-not-found +++ b/helpers/make-command-not-found @@ -25,7 +25,7 @@ rm -rf CommandNotFound/db/dists/$UPSTREAM*/multiverse rm -rf CommandNotFound/db/dists/$UPSTREAM*/restricted for word in restricted nonfree multiverse aee afio app-install-data-commercial app-install-data-partner b43-fwcutter bcm43xx-fwcutter chromium-codecs-ffmpeg chromium-browser d4x easycrypt gdecrypt envyng-core envyng-gtk envyng-qt fglrx-installer freesci gfxboot-theme-ubuntu pitfdll helix-player isdnactivecards isdnutils ivman jockey mame mesademos moon ndisgtk ndiswrapper nikto nvidia-common nvidia-graphics-drivers nvidia-graphics-drivers-173 nvidia-graphics-drivers-180 nvidia-graphics-drivers-71 nvidia-graphics-drivers-96 nvidia-settings nvidia-xconfig ophcrack rman simutrans-pak128.britain simutrans simutrans-pak64 scribus-ng-doc software-center starfighter tatan testdrive unetbootin ubuntuone-client ubuntu-restricted-extras rhythmbox-ubuntuone-music-store seamonkey ubuntuone-dev-tools libubuntuone ubuntuone-storage-protocol user-mode-linux user-mode-linux-doc vrms 9wm 9menu w9wm acetoneiso a2ps-perl-ja bibletime bibledit bible-kjv winetricks ; do - /bin/sed "/$word/d" -i CommandNotFound/db/dists/$UPSTREAM*/*/cnf/Commands-* + /bin/sed "/name: .*$word.*/,+3d" -i CommandNotFound/db/dists/$UPSTREAM*/*/cnf/Commands-* done #sed 's/|universe|/|main|/' -i ./UnifiedDataExtractor/scan.data -- GitLab From 0539d2d603977033146d9ab15e105b0421dad697 Mon Sep 17 00:00:00 2001 From: Mason Hock <mason@masonhock.com> Date: Thu, 5 Sep 2019 14:53:06 -0700 Subject: [PATCH 3/4] clean and bump version --- helpers/make-command-not-found | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/helpers/make-command-not-found b/helpers/make-command-not-found index 7b153ff2..1f841f7a 100644 --- a/helpers/make-command-not-found +++ b/helpers/make-command-not-found @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 . ./config @@ -28,8 +28,6 @@ for word in restricted nonfree multiverse aee afio app-install-data-commercial a /bin/sed "/name: .*$word.*/,+3d" -i CommandNotFound/db/dists/$UPSTREAM*/*/cnf/Commands-* done -#sed 's/|universe|/|main|/' -i ./UnifiedDataExtractor/scan.data - changelog "Removed references to non-free software" compile -- GitLab From d3728fc976a18a3d906c3b2317a6dd7fe31cc4f8 Mon Sep 17 00:00:00 2001 From: Mason Hock <mason@masonhock.com> Date: Fri, 6 Sep 2019 09:34:04 -0700 Subject: [PATCH 4/4] update copyright --- helpers/make-command-not-found | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/make-command-not-found b/helpers/make-command-not-found index 1f841f7a..57e4b90c 100644 --- a/helpers/make-command-not-found +++ b/helpers/make-command-not-found @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2013 Rubén RodrÃguez <ruben@trisquel.info> +# Copyright (C) 2019 Mason Hock <mason@masonhock.com> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- GitLab