From 27edfbf28724339f38e3a4b5f52c89243bab4d7c Mon Sep 17 00:00:00 2001
From: cghislai <charlyghislain@gmail.com>
Date: Sun, 28 Nov 2021 15:50:12 +0100
Subject: [PATCH] Fixes

---
 android/app/src/main/AndroidManifest.xml | 2 +-
 ios/Runner.xcodeproj/project.pbxproj     | 6 +++---
 ios/Runner/Info.plist                    | 2 +-
 tools/set-bundle-identifier.sh           | 2 +-
 tools/set-package.sh                     | 6 +++---
 tools/set-title.sh                       | 9 +++++----
 6 files changed, 14 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 tools/set-bundle-identifier.sh
 mode change 100644 => 100755 tools/set-package.sh
 mode change 100644 => 100755 tools/set-title.sh

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e547e96..e02b448 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.CAMERA"/>
 
     <application
-        android:label="embedded_webview"
+        android:label="Embedded webview"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index a536e16..1354a38 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -291,7 +291,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.charlyghislain.embeddedWebview;
+				PRODUCT_BUNDLE_IDENTIFIER = com.charlyghislain.embedded_webview;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -415,7 +415,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.charlyghislain.embeddedWebview;
+				PRODUCT_BUNDLE_IDENTIFIER = com.charlyghislain.embedded_webview;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -434,7 +434,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.charlyghislain.embeddedWebview;
+				PRODUCT_BUNDLE_IDENTIFIER = com.charlyghislain.embedded_webview;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index d19a428..d03aa3e 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>embedded_webview</string>
+	<string>Embedded webvie</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/tools/set-bundle-identifier.sh b/tools/set-bundle-identifier.sh
old mode 100644
new mode 100755
index d05e5bd..2420e82
--- a/tools/set-bundle-identifier.sh
+++ b/tools/set-bundle-identifier.sh
@@ -4,4 +4,4 @@ BUNDLE_NAME="$1"
 
 echo "Setting the ios bundle name to $BUNDLE_NAME"
 
-sed -i "s/PRODUCT_BUNDLE_IDENTIFIER = .*;/PRODUCT_BUNDLE_IDENTIFIER = $BUNDLE_NAME;" ios/Runner.xcodeproj/project.pbxproj
+sed -i "s/PRODUCT_BUNDLE_IDENTIFIER = .*;/PRODUCT_BUNDLE_IDENTIFIER = $BUNDLE_NAME;/" ios/Runner.xcodeproj/project.pbxproj
diff --git a/tools/set-package.sh b/tools/set-package.sh
old mode 100644
new mode 100755
index 54a87df..595a20c
--- a/tools/set-package.sh
+++ b/tools/set-package.sh
@@ -4,9 +4,9 @@ PACKAGE="$1"
 
 echo "Setting the application android package to $PACKAGE"
 
-sed -i "s/package=\"[^\"]\+\"/package=\"$PACKAGE\"/" android/app/src/debug/AndroidManfest.xml
-sed -i "s/package=\"[^\"]\+\"/package=\"$PACKAGE\"/" android/app/src/main/AndroidManfest.xml
-sed -i "s/package=\"[^\"]\+\"/package=\"$PACKAGE\"/" android/app/src/profile/AndroidManfest.xml
+sed -i "s/package=\"[^\"]\+\"/package=\"$PACKAGE\"/" android/app/src/debug/AndroidManifest.xml
+sed -i "s/package=\"[^\"]\+\"/package=\"$PACKAGE\"/" android/app/src/main/AndroidManifest.xml
+sed -i "s/package=\"[^\"]\+\"/package=\"$PACKAGE\"/" android/app/src/profile/AndroidManifest.xml
 
 sed -i "s/applicationId \"[^\"]\+\"/applicationId \"$PACKAGE\"/" android/app/build.gradle
 
diff --git a/tools/set-title.sh b/tools/set-title.sh
old mode 100644
new mode 100755
index e25eb0b..68cc97f
--- a/tools/set-title.sh
+++ b/tools/set-title.sh
@@ -4,15 +4,16 @@ TITLE="$1"
 
 echo "Setting the application title  to $TITLE"
 
-sed -i "s/android:label=\"[^\"]\+\"/android:label=\"$TITLE\"/"  android/app/src/main/AndroidManfest.xml
+sed -i "s/android:label=\"[^\"]\+\"/android:label=\"$TITLE\"/"  android/app/src/main/AndroidManifest.xml
 
 NAME_LENGTH="${#TITLE}"
 LONG_NAME="$(( $NAME_LENGTH > 15))" # 1 if long name
-BUNDLE_NAME="$(cut -c -15 $TITLE)"
+BUNDLE_NAME="$(echo $TITLE | cut -c -15)"
 
-perl -0777 -i -pe "s/\t<key>CFBundleName</key>\n[^\n]+/\t<key>CFBundleName</key>\n\t<string>$BUNDLE_NAME</string>/igs"
+perl -0777 -i -pe "s#\t<key>CFBundleName</key>\n[^\n]+#\t<key>CFBundleName</key>\n\t<string>$BUNDLE_NAME</string>#igs" ios/Runner/Info.plist
 
-if [ "$LONG_NAME" = "1" ] ; then
+ if [ "$LONG_NAME" = "1" ] ; then
 # todo : set bundleDisplayName
+echo "Warning: name truncated to $BUNDLE_NAME"
 fi