From 602facf31a559def6242c4456393898039833efd Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sat, 15 Jan 2022 19:04:26 -0800 Subject: [PATCH] Move feed and downloads back to S3 --- Application/AppController.m | 3 ++- Info.plist | 2 +- Preferences/Preferences/AppcastArrayController.m | 2 +- Scripts/update_feed.rb | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Application/AppController.m b/Application/AppController.m index 109b4667d..a3a1de87e 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -456,7 +456,7 @@ void* kAppControllerContext = &kAppControllerContext; NSNumber *fontSize = [NSNumber numberWithFloat:fFontSize]; [userDefaultsValuesDict setObject:fontSize forKey:@"fontSize"]; - NSString *feedURLdefault = @"https://f.losno.co/cog/mercury.xml"; + NSString *feedURLdefault = @"https://cogcdn.cog.losno.co/mercury.xml"; [userDefaultsValuesDict setObject:feedURLdefault forKey:@"SUFeedURL"]; [userDefaultsValuesDict setObject:@"clearAndPlay" forKey:@"openingFilesBehavior"]; @@ -487,6 +487,7 @@ void* kAppControllerContext = &kAppControllerContext; @"https://kode54.net/cog/stable.xml", @"https://kode54.net/cog/mercury.xml" @"https://www.kode54.net/cog/mercury.xml", + @"https://f.losno.co/cog/mercury.xml", nil]; NSString *feedURL = [[NSUserDefaults standardUserDefaults] stringForKey:@"SUFeedURL"]; if ([brokenFeedURLs containsObject:feedURL]) { diff --git a/Info.plist b/Info.plist index 022e45197..5a76a1d8c 100644 --- a/Info.plist +++ b/Info.plist @@ -1044,7 +1044,7 @@ NSRemindersUsageDescription Cog has no use for your reminders. Why are you trying to access them with an audio player? SUFeedURL - https://f.losno.co/cog/mercury.xml + https://cogcdn.cog.losno.co/mercury.xml SUPublicEDKey omxG7Rp0XK9/YEvKbVy7cd44eVAh1LJB6CmjQwjOJz4= diff --git a/Preferences/Preferences/AppcastArrayController.m b/Preferences/Preferences/AppcastArrayController.m index 737b5d15f..d9cacf8f9 100644 --- a/Preferences/Preferences/AppcastArrayController.m +++ b/Preferences/Preferences/AppcastArrayController.m @@ -29,7 +29,7 @@ [self addObject: [NSDictionary dictionaryWithObjectsAndKeys: - NSLocalizedStringFromTableInBundle(@"losno.co wheneverly", nil, [NSBundle bundleForClass:[self class]], @"") , @"name", @"https://f.losno.co/cog/mercury.xml", @"url",nil]]; + NSLocalizedStringFromTableInBundle(@"cog.losno.co wheneverly", nil, [NSBundle bundleForClass:[self class]], @"") , @"name", @"https://cogcdn.cog.losno.co/mercury.xml", @"url",nil]]; } @end diff --git a/Scripts/update_feed.rb b/Scripts/update_feed.rb index c815ab70d..74a7b1d3d 100755 --- a/Scripts/update_feed.rb +++ b/Scripts/update_feed.rb @@ -103,16 +103,16 @@ if 1 #appcast_revision < latest_revision deltas = Dir.entries("#{site_dir}/#{feed}_builds").select { |f| f =~ /\A#{Regexp.escape(deltamask)}.+\.delta\z/ }.map { |f| File.join("#{site_dir}/#{feed}_builds", f) } #Upload them to S3 - %x[s3cmd put -P -m application/octet-stream #{deltas.shelljoin} '#{site_dir}/#{feed}_builds/#{filename}' s3://balde-losno-co/cog/] + %x[s3cmd put -P -m application/octet-stream #{deltas.shelljoin} '#{site_dir}/#{feed}_builds/#{filename}' s3://cogcdn.cog.losno.co] #Upload the changelog that Sparkle will display - %x[s3cmd put -P -m text/html '#{site_dir}/#{feed}_builds/#{filenamedesc}' s3://balde-losno-co/cog/] + %x[s3cmd put -P -m text/html '#{site_dir}/#{feed}_builds/#{filenamedesc}' s3://cogcdn.cog.losno.co] #Clean up %x[rm -rf '#{temp_path}/Cog.app'] #Upload to S3 - %x[s3cmd put -P -m application/xml '#{site_dir}/#{feed}_builds/#{feed}.xml' s3://balde-losno-co/cog/] + %x[s3cmd put -P -m application/xml '#{site_dir}/#{feed}_builds/#{feed}.xml' s3://cogcdn.cog.losno.co] #Send web hook to update site update_uri = %x[security find-generic-password -w -a #{ENV['LOGNAME']} -s cogupdateurl]