Skip to content

Commit

Permalink
Merge pull request #29 from Anidetrix/master
Browse files Browse the repository at this point in the history
Updates and fixes
  • Loading branch information
oltolm committed May 12, 2019
2 parents 8aa066b + 0ec58f5 commit 76b3843
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 42 deletions.
4 changes: 2 additions & 2 deletions bin/formatjson.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if(!$env:SCOOP_HOME) { $env:SCOOP_HOME = resolve-path (split-path (split-path (scoop which scoop))) }
$formatjson = "$env:SCOOP_HOME/bin/formatjson.ps1"
$path = "$psscriptroot/.." # checks the parent dir
iex -command "$formatjson -path $path $($args |% { "$_ " })"
$dir = "$psscriptroot/.." # checks the parent dir
iex -command "$formatjson -dir $dir $($args |% { "$_ " })"
18 changes: 7 additions & 11 deletions innosetup-np.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{
"homepage": "http://www.jrsoftware.org/isinfo.php",
"version": "5.6.1",
"version": "6.0.2",
"license": "Inno Setup License",
"url": "http://www.jrsoftware.org/download.php/is-unicode.exe#innosetup-5.6.1-unicode.exe",
"hash": "27d49e9bc769e9d1b214c153011978db90dc01c2acd1ddcd9ed7b3fe3b96b538",
"bin": [
"Compil32.exe"
],
"url": "http://www.jrsoftware.org/download.php/is.exe#innosetup-6.0.2.exe",
"hash": "4af479bd44e2bfb2a4bfab6a19f9563e370ef52d86362e7b3d198e9daff62b64",
"bin": "Compil32.exe",
"installer": {
"args": [
"/VERYSILENT",
Expand All @@ -16,15 +14,13 @@
},
"uninstaller": {
"file": "unins000.exe",
"args": [
"/VERYSILENT"
]
"args": "/VERYSILENT"
},
"checkver": {
"url": "http://www.jrsoftware.org/isdl.php",
"re": "innosetup-([\\d.]+)-unicode\\.exe"
"re": "innosetup-([\\d.]+)\\.exe"
},
"autoupdate": {
"url": "http://www.jrsoftware.org/download.php/is-unicode.exe#innosetup-$version-unicode.exe"
"url": "http://www.jrsoftware.org/download.php/is.exe#innosetup-$version.exe"
}
}
6 changes: 3 additions & 3 deletions k-lite-codec-pack-basic-np.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"homepage": "https://codecguide.com",
"description": "The Standard variant of the codec pack is what we recommend for the average user. It contains the advanced player MPC-HC plus all the essential codecs needed for multimedia playback.",
"version": "14.9.0",
"url": "https://files3.codecguide.com/K-Lite_Codec_Pack_1490_Basic.exe#/klite_setup.exe",
"hash": "e9defda32c6a9feeafa957fb55676b23a29c1919635fa820d16846a7047b127e",
"version": "14.9.4",
"url": "https://files3.codecguide.com/K-Lite_Codec_Pack_1494_Basic.exe#/klite_setup.exe",
"hash": "8544bcc93e92ea787c6694eb64976d6ab57260a604a895d75abe732a5c1c1d97",
"installer": {
"file": "klite_setup.exe",
"args": [
Expand Down
6 changes: 3 additions & 3 deletions k-lite-codec-pack-full-np.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"homepage": "https://codecguide.com",
"description": "The Standard variant of the codec pack is what we recommend for the average user. It contains the advanced player MPC-HC plus all the essential codecs needed for multimedia playback.",
"version": "14.9.0",
"url": "https://files3.codecguide.com/K-Lite_Codec_Pack_1490_Full.exe#/klite_setup.exe",
"hash": "97341fc7e8f4327cf4ab565f87b3ee01891e54ceda9403c2dd29e1e0706bef3f",
"version": "14.9.4",
"url": "https://files3.codecguide.com/K-Lite_Codec_Pack_1494_Full.exe#/klite_setup.exe",
"hash": "11c8613fafa77d22dad289fd5bfe8d4ff4961322bb0265bc67eb580348633f1e",
"installer": {
"file": "klite_setup.exe",
"args": [
Expand Down
6 changes: 3 additions & 3 deletions k-lite-codec-pack-mega-np.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"homepage": "https://codecguide.com",
"description": "The Standard variant of the codec pack is what we recommend for the average user. It contains the advanced player MPC-HC plus all the essential codecs needed for multimedia playback.",
"version": "14.9.0",
"url": "https://files3.codecguide.com/K-Lite_Codec_Pack_1490_Mega.exe#/klite_setup.exe",
"hash": "358b1691a3e5571602a8a44275e5089497763d85fc21591974c42782627f11c0",
"version": "14.9.4",
"url": "https://files3.codecguide.com/K-Lite_Codec_Pack_1494_Mega.exe#/klite_setup.exe",
"hash": "ca06ac22c45a17c6d910325d4ac160935961c2e1f0e67855715e1cf99e3fb0ce",
"installer": {
"file": "klite_setup.exe",
"args": [
Expand Down
6 changes: 3 additions & 3 deletions k-lite-codec-pack-standard-np.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"homepage": "https://codecguide.com",
"description": "The Standard variant of the codec pack is what we recommend for the average user. It contains the advanced player MPC-HC plus all the essential codecs needed for multimedia playback.",
"version": "14.9.0",
"url": "https://files3.codecguide.com/K-Lite_Codec_Pack_1490_Standard.exe#/klite_setup.exe",
"hash": "3171797de9f6759ff28b4cbcd75709959dd3aad88dc2d49ae06de40e13852c49",
"version": "14.9.4",
"url": "https://files3.codecguide.com/K-Lite_Codec_Pack_1494_Standard.exe#/klite_setup.exe",
"hash": "ac9a511fee64766699ebdc83c6652d780c3e2e422709f1d34b21eaaf40b0f6d4",
"installer": {
"file": "klite_setup.exe",
"args": [
Expand Down
14 changes: 7 additions & 7 deletions nodejs-np.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"homepage": "https://nodejs.org",
"version": "11.14.0",
"version": "12.2.0",
"license": "MIT",
"architecture": {
"64bit": {
"url": "https://nodejs.org/dist/v11.14.0/node-v11.14.0-win-x64.7z",
"hash": "4d112525851b429b387dd69c9c7042a30190be3b1563cf30ac685260836917d5",
"extract_dir": "node-v11.14.0-win-x64"
"url": "https://nodejs.org/dist/v12.2.0/node-v12.2.0-win-x64.7z",
"hash": "cb65032a92702fd3506f860888c74ca77fb70d60732d1f7458528cc3b44c28c9",
"extract_dir": "node-v12.2.0-win-x64"
},
"32bit": {
"url": "https://nodejs.org/dist/v11.14.0/node-v11.14.0-win-x86.7z",
"hash": "6f210fd61a3c689bef77ff242c5250c514988f259dbc4d6fdab6e3cb3572d0d7",
"extract_dir": "node-v11.14.0-win-x86"
"url": "https://nodejs.org/dist/v12.2.0/node-v12.2.0-win-x86.7z",
"hash": "59eaa4659267c5aef27e870d8fb7af7b4fde17e755fad747d7eb5c781a858e7b",
"extract_dir": "node-v12.2.0-win-x86"
}
},
"bin": [
Expand Down
6 changes: 3 additions & 3 deletions pgadmin4-np.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"homepage": "https://www.pgadmin.org",
"description": "pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL.",
"version": "4.5",
"url": "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.5/windows/pgadmin4-4.5-x86.exe",
"hash": "19e450408c707688781137e50dc893e8b45833839dd0748ddccd8f532bc60717",
"version": "4.6",
"url": "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.6/windows/pgadmin4-4.6-x86.exe",
"hash": "9b571f6450c4f33ac164697e7010c912fee0815f45b255ed716ef12833dbb8c2",
"bin": [
"runtime\\psql.exe",
"runtime\\pgAdmin4.exe",
Expand Down
13 changes: 6 additions & 7 deletions winrar-np.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{
"homepage": "https://www.rarlab.com/",
"description": "Powerful archive manager. It can backup your data and reduce the size of email attachments, decompress RAR, ZIP and other files downloaded from Internet and create new archives in RAR and ZIP file format.",
"version": "5.70",
"homepage": "https://rarlab.com/",
"description": "Powerful archive manager. It can backup your data and reduce the size of email attachments, decompress RAR, ZIP and other files downloaded from Internet and create new archives in RAR and ZIP file format.",
"version": "5.71",
"license": "Shareware",
"architecture": {
"64bit": {
"url": "https://www.rarlab.com/rar/winrar-x64-570.exe",
"hash": "5e5ae8476052b973b427fe4991aeee2bf5b05ceae5bb45ed67849d06cb031471"
"url": "https://www.rarlab.com/rar/winrar-x64-571.exe",
"hash": "fd820bf82edbaa4be20fd3b644a05754d95d71de60fe79ab983c3318e0697540"
},
"32bit": {
"url": "https://www.rarlab.com/rar/wrar570.exe",
"hash": "2b56b58a2ec260589770b377256831d5c3d0f4efe012b109f2c9d31fcc855ff7"
"url": "https://www.rarlab.com/rar/wrar571.exe",
"hash": "df5432792436545c8255f98cbf659ceca63e13d29c1cc74944ab70e34feb96fa"
}
},
"bin": [
Expand Down

0 comments on commit 76b3843

Please sign in to comment.