Fix licenses

rasa · Aug 11, 2018 · 33bb6b3 · 33bb6b3
1 parent c61e22b
commit 33bb6b3
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/audacity-ffmpeg-plugin.json b/audacity-ffmpeg-plugin.json
@@ -12,7 +12,7 @@
     "description": "FFMPEG plugin for Audacity",
     "hash": "84b0669f71cfb44e557e54ae2c863b89cfa544d1ecf751d7114e2b5955eb0cb2",
     "homepage": "http://lame.buanzo.org/",
-    "license": "LGPL-2.1",
+    "license": "LGPL-2.1-only",
     "post_install": [
         "cp \"$dir/*.dll\" \"$(appdir audacity)/current\"",
         "cp \"$dir/*.exe\" \"$(appdir audacity)/current\""

diff --git a/diffpdf.json b/diffpdf.json
@@ -10,7 +10,7 @@
     "description": "Compare two PDF files",
     "hash": "b698b9c3c3c0582c2b5ea474d4df0c5f864b649774e857fdc423b4949ef79b6d",
     "homepage": "http://soft.rubypdf.com/software/diffpdf",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "url": "http://soft.rubypdf.com/wp-content/uploads/2010/08/diffpdf-2.1.3-win32-static.zip",
     "version": "2.1.3"
 }
diff --git a/fat32format.json b/fat32format.json
@@ -6,7 +6,7 @@
     "description": "Format disk media using FAT32",
     "hash": "812a33f01c7d73a1e4b89427c01b6bf967dc8d8ef3671200f381b130356b3068",
     "homepage": "http://www.ridgecrop.demon.co.uk/index.htm?fat32format.htm",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "url": "http://www.ridgecrop.demon.co.uk/download/fat32format.zip",
     "version": "1.07"
 }
diff --git a/gifsicle.json b/gifsicle.json
@@ -30,6 +30,6 @@
     "checkver": "href=\"releases/gifsicle-([\\d.]+)",
     "description": "Manipulate GIF images",
     "homepage": "https://eternallybored.org/misc/gifsicle/",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "version": "1.89"
 }
diff --git a/usbdeview-ids.json b/usbdeview-ids.json
@@ -7,7 +7,7 @@
     ],
     "description": "USB device database used by Nirsoft's usbdeview",
     "homepage": "http://www.linux-usb.org/usb-ids.html",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "post_install": [
         "if (Test-Path \"$(appdir nirlauncher)\") {",
         "   Copy-Item \"$dir/usb.ids\" \"$(appdir nirlauncher)/current/NirSoft/usb.ids\"",

diff --git a/validate.py b/validate.py
@@ -34,14 +34,17 @@ def decode(s):
     return s.decode('latin-1')
 
 
-schema_name = '%s/scoop/apps/scoop/current/schema.json' % os.environ[
-    'USERPROFILE']
+schema_name = 'D:/github/rasa/scoop/schema.json'
+
+if not os.path.isfile(schema_name):
+    schema_name = '%s/scoop/apps/scoop/current/schema.json' % os.environ[
+        'USERPROFILE']
 
 file = sys.argv[1]
 if re.match('^schema', file):
     sys.exit(0)
 
-print('Validating', file)
+print('Validating %s via %s' % (file, schema_name))
 
 with open(schema_name, 'r') as f:
     schema_data = json.load(f)

diff --git a/vlc-bluray-plugin.json b/vlc-bluray-plugin.json
@@ -26,7 +26,7 @@
     ],
     "description": "VLC Blu-ray plugin",
     "homepage": "https://www.videolan.org/",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "post_install": [
         "New-Item -ItemType Directory -Force -Path \"$($env:ProgramData)/aacs\" >$null",
         "Copy-Item \"$dir/KEYDB.cfg\" \"$($env:ProgramData)/aacs\"",

diff --git a/vlc-bluray.json b/vlc-bluray.json
@@ -30,7 +30,7 @@
     "bin": "vlc.exe",
     "description": "VLC with Blu-ray plugin (requires 2.2.4)",
     "homepage": "https://www.videolan.org/",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "post_install": [
         "New-Item -ItemType Directory -Force -Path \"$($env:ProgramData)/aacs\" >$null",
         "Copy-Item \"$dir/KEYDB.cfg\" \"$($env:ProgramData)/aacs\""