@@ -12,14 +12,12 @@ internal class Program
1212 private static string version = System . Reflection . Assembly . GetExecutingAssembly ( ) . GetName ( ) . Version . ToString ( 3 ) ;
1313 private const string USER = "mattpannella" ;
1414 private const string REPOSITORY = "pocket-updater-utility" ;
15- private const string RELEASE_URL = "https://github.com/mattpannella/pocket-updater-utility/releases/download/{0}/pocket_updater_{1}.zip" ;
16- private const string NEW_RELEASE_URL = "https://github.com/mattpannella/pocket-updater-utility/releases/download/{0}/pupdate_{1}.zip" ;
15+ private const string RELEASE_URL = "https://github.com/mattpannella/pocket-updater-utility/releases/download/{0}/pupdate_{1}.zip" ;
1716 private static SettingsManager settings ;
1817
1918 private static PocketCoreUpdater updater ;
2019
2120 private static bool cliMode = false ;
22- private static bool migrate = false ;
2321 private static async Task Main ( string [ ] args )
2422 {
2523 try {
@@ -122,6 +120,9 @@ private static async Task Main(string[] args)
122120 if ( o . InstallPath != null && o . InstallPath != "" ) {
123121 path = o . InstallPath ;
124122 }
123+ if ( o . SkipUpdate ) {
124+ cliMode = true ;
125+ }
125126 }
126127 )
127128 . WithNotParsed ( o =>
@@ -136,7 +137,7 @@ private static async Task Main(string[] args)
136137 ) ;
137138
138139 if ( ! cliMode ) {
139- Console . WriteLine ( "Pocket Updater Utility v" + version ) ;
140+ Console . WriteLine ( "Pupdate v" + version ) ;
140141 Console . WriteLine ( "Checking for updates..." ) ;
141142
142143 if ( await CheckVersion ( path ) && ! selfUpdate ) {
@@ -315,37 +316,16 @@ private static async Task Main(string[] args)
315316 }
316317 }
317318
318- static void DisplayHelp < T > ( ParserResult < T > result )
319- {
320- var helpText = CommandLine . Text . HelpText . AutoBuild ( result , h =>
321- {
322- h . AdditionalNewLineAfterOption = false ;
323- h . Heading = "Myapp 2.0.0-beta" ; //change header
324- h . Copyright = "Copyright (c) 2019 Global.com" ; //change copyright text
325- return CommandLine . Text . HelpText . DefaultParsingErrorsHandler ( result , h ) ;
326- } , e => e ) ;
327- Console . WriteLine ( helpText ) ;
328- }
329-
330319 private static int UpdateSelfAndRun ( string directory , string [ ] updaterArgs )
331320 {
332- string execName = "pocket_updater" ;
333- string newExecName = "pocket_updater" ;
334- if ( migrate ) {
335- newExecName = "pupdate" ;
336- }
321+ string execName = "pupdate" ;
337322 if ( GetPlatform ( ) == "win" ) {
338323 execName += ".exe" ;
339- newExecName += ".exe" ;
340324 }
341325 string execLocation = Path . Combine ( directory , execName ) ;
342- string newExecLocation = Path . Combine ( directory , newExecName ) ;
343326 string backupName = $ "{ execName } .backup";
344327 string backupLocation = Path . Combine ( directory , backupName ) ;
345- string updateName = "pocket_updater.zip" ;
346- if ( migrate ) {
347- updateName = "pupdate.zip" ;
348- }
328+ string updateName = "pupdate.zip" ;
349329 string updateLocation = Path . Combine ( directory , updateName ) ;
350330
351331 int exitcode = int . MinValue ;
@@ -366,8 +346,8 @@ private static int UpdateSelfAndRun(string directory, string[] updaterArgs)
366346 ZipFile . ExtractToDirectory ( updateLocation , directory , true ) ;
367347
368348 // Execute
369- Console . WriteLine ( $ "Executing { newExecLocation } ") ;
370- ProcessStartInfo pInfo = new ProcessStartInfo ( newExecLocation ) {
349+ Console . WriteLine ( $ "Executing { execLocation } ") ;
350+ ProcessStartInfo pInfo = new ProcessStartInfo ( execLocation ) {
371351 Arguments = string . Join ( ' ' , updaterArgs ) ,
372352 UseShellExecute = false
373353 } ;
@@ -694,21 +674,14 @@ async static Task<bool> CheckVersion(string path)
694674 List < Github . Release > releases = await GithubApi . GetReleases ( USER , REPOSITORY ) ;
695675
696676 string tag_name = releases [ 0 ] . tag_name ;
697- string releaseUrl = RELEASE_URL ;
698- string fileName = "pocket_updater" ;
699- if ( tag_name == "3.0.0" ) {
700- releaseUrl = NEW_RELEASE_URL ;
701- fileName = "pupdate" ;
702- migrate = true ;
703- }
704677 string ? v = SemverUtil . FindSemver ( tag_name ) ;
705678 if ( v != null ) {
706679 bool check = SemverUtil . SemverCompare ( v , version ) ;
707680 if ( check ) {
708681 Console . WriteLine ( "A new version is available. Downloading now..." ) ;
709682 string platform = GetPlatform ( ) ;
710- string url = String . Format ( releaseUrl , tag_name , platform ) ;
711- string saveLocation = Path . Combine ( path , $ " { fileName } .zip") ;
683+ string url = String . Format ( RELEASE_URL , tag_name , platform ) ;
684+ string saveLocation = Path . Combine ( path , "pupdate .zip") ;
712685 await Factory . GetHttpHelper ( ) . DownloadFileAsync ( url , saveLocation ) ;
713686 Console . WriteLine ( "Download complete." ) ;
714687 Console . WriteLine ( saveLocation ) ;
@@ -725,7 +698,6 @@ async static Task<bool> CheckVersion(string path)
725698 }
726699 }
727700
728-
729701 private static string GetPlatform ( )
730702 {
731703 if ( RuntimeInformation . IsOSPlatform ( OSPlatform . Windows ) ) {
@@ -1008,15 +980,24 @@ __ _ | |
1008980| |__| -_| _| |_ -| | | . |_ -| -_| | |
1009981|_____|___|_| |___| |_|_|_|___|___|___|_ |
1010982 |___|" ,
1011-
1012-
983+ @" _=,_
984+ o_/6 /#\
985+ \__ |##/
986+ ='|--\
987+ / #'-.
988+ \#|_ _'-. /
989+ |/ \_( # |''
990+ C/ ,--___/"
1013991 } ;
1014992}
1015993[ Verb ( "menu" , isDefault : true , HelpText = "Interactive Main Menu" ) ]
1016994public class MenuOptions
1017995{
1018996 [ Option ( 'p' , "path" , HelpText = "Absolute path to install location" , Required = false ) ]
1019997 public string ? InstallPath { get ; set ; }
998+
999+ [ Option ( 's' , "skip-update" , HelpText = "Skip the self update check" , Required = false ) ]
1000+ public bool SkipUpdate { get ; set ; }
10201001}
10211002
10221003[ Verb ( "update" , HelpText = "Run update all. (You can configure via the settings menu)" ) ]
0 commit comments