From c17366b2b11fa827f163c25ab7e9c3058403683b Mon Sep 17 00:00:00 2001 From: Andy Li Date: Fri, 11 May 2018 16:39:39 +0800 Subject: [PATCH] [AppVeyor] update flash install script --- flash/.gitignore | 4 +++- flash/Install.hx | 15 ++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/flash/.gitignore b/flash/.gitignore index 640713c..10fd69a 100644 --- a/flash/.gitignore +++ b/flash/.gitignore @@ -1,3 +1,5 @@ *.exe *.app -flashplayerdebugger \ No newline at end of file +flashplayerdebugger +LGPL/ +license.pdf \ No newline at end of file diff --git a/flash/Install.hx b/flash/Install.hx index 64cef38..0cfe637 100644 --- a/flash/Install.hx +++ b/flash/Install.hx @@ -1,4 +1,5 @@ import Sys.*; +import sys.FileSystem.*; import sys.io.File.*; import haxe.*; import haxe.io.*; @@ -7,11 +8,11 @@ class Install { // https://www.adobe.com/support/flashplayer/downloads.html static var fpDownload(default, never) = switch (systemName()) { case "Linux": - "http://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux_debug.x86_64.tar.gz"; + "http://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz"; case "Mac": - "http://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flashplayer_25_sa_debug.dmg"; + "http://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flashplayer_26_sa_debug.dmg"; case "Windows": - "http://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flashplayer_25_sa_debug.exe"; + "http://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flashplayer_26_sa_debug.exe"; case _: throw "unsupported system"; } @@ -33,7 +34,7 @@ class Install { case "Mac": "/Library/Application Support/Macromedia/FlashPlayerTrust"; case "Windows": - Path.join([getEnv("SYSTEMROOT"), "system32", "Macromed", "Flash", "FlashPlayerTrust"]); + Path.join([getEnv("APPDATA"), "Macromedia", "Flash Player", "#Security", "FlashPlayerTrust"]); case _: throw "unsupported system"; } @@ -45,12 +46,8 @@ class Install { throw "failed to download flash player"; if (command("tar", ["-xf", Path.withoutDirectory(fpDownload), "-C", "flash"]) != 0) throw "failed to extract flash player"; + deleteFile(Path.withoutDirectory(fpDownload)); case "Mac": - // https://github.com/caskroom/homebrew-cask/pull/15381 - if (command("brew", ["uninstall", "--force", "brew-cask"]) != 0) - throw "failed to brew uninstall --force brew-cask"; - if (command("brew", ["tap", "caskroom/versions"]) != 0) - throw "failed to brew tap caskroom/versions"; if (command("brew", ["cask", "install", "flash-player-debugger"]) != 0) throw "failed to install flash-player-debugger"; case "Windows":