Merge pull request #19 from sacloud/update/usacloud

Update/usacloud Ver.0.2.2
sacloud · Oct 22, 2017 · 99dbca6 · 99dbca6
2 parents 9b0fb33 + c4f1146
commit 99dbca6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 40 deletions.
diff --git a/usacloud/tools/chocolateyinstall.ps1 b/usacloud/tools/chocolateyinstall.ps1
@@ -1,17 +1,13 @@
-# IMPORTANT: Before releasing this package, copy/paste the next 2 lines into PowerShell to remove all comments from this file:
-#   $f='c:\path\to\thisFile.ps1'
-#   gc $f | ? {$_ -notmatch "^\s*#"} | % {$_ -replace '(^.*?)\s*?[^``]#.*','$1'} | Out-File $f+".~" -en utf8; mv -fo $f+".~" $f
-
-$ErrorActionPreference = 'Stop';
+$ErrorActionPreference = 'Stop';
 
 $packageName  = $env:ChocolateyPackageName;
 $toolsDir     = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)";
 $softwareName = 'usacloud*';
-$url32        = 'https://github.com/sacloud/usacloud/releases/download/v0.1.1/usacloud_windows-386.zip';
-$url64        = 'https://github.com/sacloud/usacloud/releases/download/v0.1.1/usacloud_windows-amd64.zip';
+$url32        = 'https://github.com/sacloud/usacloud/releases/download/v0.2.2/usacloud_windows-386.zip';
+$url64        = 'https://github.com/sacloud/usacloud/releases/download/v0.2.2/usacloud_windows-amd64.zip';
 $hashType     = 'sha512';
-$hash32       = '7FFE8F94DE5BC2184C33F188BEA70B2159A6BD2A4AD4304A2044A64A47841AAD1F658E40509A49554DBFD0A13733514A2816415FD4CCE2A7DA3ACCCF793BD943';
-$hash64       = 'A2036DF90A2F4136A5D81792B1AA6BBD5868F28CD13BFC5FAB0DFB74FF444625BF4B5BBA515F76C7A3575D8FD2904F9B145F05EE885BC44CDF6D9666028AA2FE';
+$hash32       = '17262EC2B129FCBCC0198054AAE130EF0A40F5348266B106053B50A354CAD50314205C8949D79274EF0194EF0535B454C40D3F1F28E6D6E6D7351528D7492DB4';
+$hash64       = '59CF775AA9943A85C27DAB17A2731AE05F0B08E116079326475EF751ACC3806B95CE334EBDD24B626F33A6CEFB852E787A7E211AB1E2D7E69BB0DF7E00A30FED';
 
 $packageArgs = @{
   packageName   = $packageName

diff --git a/usacloud/tools/chocolateyuninstall.ps1 b/usacloud/tools/chocolateyuninstall.ps1
@@ -14,5 +14,9 @@ $packageArgs = @{
 $uninstalled = $false
 
 # Only necessary if you did not unpack to package directory - see https://chocolatey.org/docs/helpers-uninstall-chocolatey-zip-package
-Uninstall-ChocolateyZipPackage -PackageName $packageArgs['packageName'] -ZipFileName $packageArgs['zipFileName']
-Uninstall-ChocolateyZipPackage -PackageName $packageArgs['packageName'] -ZipFileName $packageArgs['zipFileName64']
+$os = Get-WmiObject -Class Win32_OperatingSystem;
+if ($os.OSarchitecture.Contains("64")) {
+  Uninstall-ChocolateyZipPackage -PackageName $packageArgs['packageName'] -ZipFileName $packageArgs['zipFileName']
+} else {
+  Uninstall-ChocolateyZipPackage -PackageName $packageArgs['packageName'] -ZipFileName $packageArgs['zipFileName64']
+}
diff --git a/usacloud/usacloud.nuspec b/usacloud/usacloud.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <!-- == PACKAGE SPECIFIC SECTION == -->
     <id>usacloud</id>
-    <version>0.1.1</version>
+    <version>0.2.2</version>
     <owners>223n (@223n)</owners>
     <!-- ============================== -->
 
@@ -46,45 +46,23 @@
     <releaseNotes>
 # EN
 ## ChangeLog
-  - Add log output function of VPC router #179
-  - Add database logging function #181
-  - Add database backup function #183
-  - Add database monitoring function #185
-  - Change default key of monitor function #187
-  - Add function to switch multiple API keys #188
-  - Add summary command #190
-  - Add interface-driver item #192
-  - Add default targeting of billing CSV #194
-  - Refactoring package layout #195
-  - Fix summary command help #197
-  - Change log name of database #198
-  - Add validation skip of global option of config command #200
+  - Added NFS appliance plan. #220
+  - Update documents. #221
 
 ## Remarks
   - For details, please check CHANGELOG (Japanese) of GitHub.
-  - https://github.com/sacloud/usacloud/releases/tag/v0.0.13
+  - https://github.com/sacloud/usacloud/releases
 
 ----
 
 # JP
 ## ChangeLog
-  - VPCルータでのログ出力機能追加 #179
-  - データベースでのログ出力機能追加 #181
-  - データベースでのバックアップ機能追加 #183
-  - データベースでのモニター機能追加 #185
-  - モニター機能デフォルトキー変更 #187
-  - 複数のAPIキーの切り替え機能 #188
-  - summaryコマンドの追加 #190
-  - interface-driver項目の追加 #192
-  - 請求CSVでのデフォルトターゲット指定 #194
-  - パッケージレイアウトのリファクタリング #195
-  - summaryコマンドヘルプ修正 #197
-  - データベースのログ名称変更 #198
-  - configコマンドでのグローバルオプションのバリデーションスキップ #200
+  - NFSアプライアンス プラン追加 #220
+  - ドキュメント更新 #221
 
 ## Remarks
   - 詳しくは、GitHubのCHANGELOG(日本語)をご確認ください。
-  - https://github.com/sacloud/usacloud/releases/tag/v0.0.13
+  - https://github.com/sacloud/usacloud/releases
     </releaseNotes>
     <!-- =============================== -->      
   </metadata>