From 6b7ab9a33b005796d97c463de67ccb704913d70a Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Mon, 11 Oct 2021 17:18:54 +0200
Subject: [PATCH] Strip DIST_PATH

---
 .env                             |  2 --
 Submodules/fastlane-ci-templates |  2 +-
 fastlane/Deliverfile             | 10 ++++------
 fastlane/Gymfile                 |  2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index 1aeac042..dff1bf71 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,3 @@
 # constant (fastlane)
 LC_ALL="en_US.UTF-8"
 LANG="en_US.UTF-8"
-
-DIST_PATH="dist"
diff --git a/Submodules/fastlane-ci-templates b/Submodules/fastlane-ci-templates
index 45d91a34..6cbcc196 160000
--- a/Submodules/fastlane-ci-templates
+++ b/Submodules/fastlane-ci-templates
@@ -1 +1 @@
-Subproject commit 45d91a34777a34ff2273992889772c0704ef6ef7
+Subproject commit 6cbcc19652dfa664e97d39619667e4c3a094138a
diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile
index fd47edab..da927bb0 100644
--- a/fastlane/Deliverfile
+++ b/fastlane/Deliverfile
@@ -5,12 +5,10 @@
 screenshots_path "#{ENV["APP_ROOT"]}/fastlane/screenshots"
 metadata_path "#{ENV["APP_ROOT"]}/fastlane/metadata"
 
-if not ENV["TARGET"].nil?
-    if ENV["PLATFORM"] == "ios"
-        ipa "#{ENV["DIST_PATH"]}/#{ENV["APP_NAME"]}.ipa"
-    else
-        pkg "#{ENV["DIST_PATH"]}/#{ENV["APP_NAME"]}.pkg"
-    end
+if ENV["PLATFORM"] == "ios"
+    ipa "dist/ios/Passepartout.ipa"
+else
+    pkg "dist/mac/Passepartout.pkg"
 end
 
 skip_binary_upload true
diff --git a/fastlane/Gymfile b/fastlane/Gymfile
index eea7ec0f..eb5964be 100644
--- a/fastlane/Gymfile
+++ b/fastlane/Gymfile
@@ -10,7 +10,7 @@
 
 # sdk "iphoneos9.0"
 
-output_directory ENV["DIST_PATH"]
+output_directory "dist/#{ENV["PLATFORM"]}"
 
 clean true
 silent false