Skip to content

Commit

Permalink
Merge commit '207ad9dff4a9e6232618c160ab35c66ebb487eef' into release/…
Browse files Browse the repository at this point in the history
…3.42

* commit '207ad9dff4a9e6232618c160ab35c66ebb487eef':
  quote override path (#3590)
  Fix share extension by retrieving the the environment from the shared user defaults (#3589)
  undo
  fix parameter passing
  fix quote
  fix double quote
  debug
  use double quote
  fix space
  fix space in path issue
  fix space excape
  debug option
  update CanvasViewController (#3583)
  • Loading branch information
billypchan committed Aug 19, 2019
2 parents 065c5b3 + 207ad9d commit 9e1a9b0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions WireCommonComponents/BackendEnvironment+Shared.swift
Expand Up @@ -18,18 +18,19 @@

import Foundation
import WireTransport
import WireUtilities

extension BackendEnvironment {

public static let backendSwitchNotification = Notification.Name("backendEnvironmentSwitchNotification")

public static var shared: BackendEnvironment = {
let bundle = Bundle.backendBundle
guard let environment = BackendEnvironment(userDefaults: .standard, configurationBundle: .backendBundle) else { fatalError("Malformed backend configuration data") }
guard let environment = BackendEnvironment(userDefaults: .shared(), configurationBundle: .backendBundle) else { fatalError("Malformed backend configuration data") }
return environment
}() {
didSet {
shared.save(in: .standard)
shared.save(in: .shared())
NotificationCenter.default.post(name: backendSwitchNotification, object: shared)
}
}
Expand Down
4 changes: 2 additions & 2 deletions fastlane/Fastfile
Expand Up @@ -13,7 +13,7 @@ platform :ios do
else
override_folder = options[:override_folder]
if override_folder.nil?
override_folder = "CI\ configuration"
override_folder = "CI configuration"
end


Expand All @@ -31,7 +31,7 @@ platform :ios do
build = Build.new(options: options)
# We need to update the AVS version before running setup script
build.update_avs_version()
sh "cd .. && ./setup.sh -c #{config_repo} -b #{config_branch} -o wire-ios-build-assets/#{override_folder}/#{build_type}"
sh "cd .. && ./setup.sh -c #{config_repo} -b #{config_branch} -o \'wire-ios-build-assets/#{override_folder}/#{build_type}\'"
# Adding extra information to the icon must be done after we check them out in setup script
build.process_icon()
end
Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Expand Up @@ -50,7 +50,7 @@ echo "ℹ️ Downloading AVS library..."
echo ""

echo "ℹ️ Downloading additional assets..."
./Scripts/download-assets.sh $@
./Scripts/download-assets.sh "$@"
echo ""

echo "ℹ️ Doing additional postprocessing..."
Expand Down

0 comments on commit 9e1a9b0

Please sign in to comment.