Merge branch 'develop' into chore/ddw-940-update-faker

Author: danielmain

CHANGELOG.md

@@ -11,6 +11,7 @@
 
 ### Fixes
 
+- Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
 - Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
 - Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))
 - Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2907](https://github.com/input-output-hk/daedalus/pull/2907))
@@ -20,6 +21,8 @@
 
 ### Chores
 
+- Using new faker.js ([PR 2855](https://github.com/input-output-hk/daedalus/pull/2855))
+- Removed `dockutil` due compatibility issues with MacOs Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
 - Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
 - Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
 - Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))

installers/common/MacInstaller.hs

@@ -177,27 +177,6 @@ codeSignEntitlements = [r|<?xml version="1.0" encoding="UTF-8"?>
   </dict>
 </plist>|]
 
-makePostInstall :: Format a (Text -> a)
-makePostInstall = "#!/usr/bin/env bash\n" %
-                  "#\n" %
-                  "# See /var/log/install.log to debug this\n" %
-                  "\n" %
-                  "src_pkg=\"$1\"\ndst_root=\"$2\"\ndst_mount=\"$3\"\nsys_root=\"$4\"\n" %
-                  "./dockutil --add \"${dst_root}/" % s % "\" --allhomes\n"
-
-makeScriptsDir :: Options -> DarwinConfig -> Managed T.Text
-makeScriptsDir Options{oBackend} DarwinConfig{dcAppNameApp} = case oBackend of
-    Cardano     _ -> common
-  where
-    common = do
-      tmp <- fromString <$> (liftIO $ getEnv "TMP")
-      tempdir <- mktempdir tmp "scripts"
-      liftIO $ do
-        cp "data/scripts/dockutil" (tempdir </> "dockutil")
-        writeTextFile (tempdir </> "postinstall") (format makePostInstall dcAppNameApp)
-        chmod executable (tempdir </> "postinstall")
-      pure $ tt tempdir
-
 makeSigningDir :: Managed (T.Text, T.Text)
 makeSigningDir = do
     tmp <- fromString <$> (liftIO $ getEnv "TMP")
@@ -389,27 +368,21 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       exit $ ExitFailure 1
 
 makeInstaller :: Options -> DarwinConfig -> FilePath -> FilePath -> IO FilePath
-makeInstaller opts@Options{oOutputDir} darwinConfig@DarwinConfig{dcPkgName} componentRoot pkg = do
+makeInstaller Options{oOutputDir} DarwinConfig{dcPkgName} componentRoot pkg = do
   echo "Making installer ..."
-  let tempPkg1 = format fp (oOutputDir </> pkg)
-      tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
+  let
+    tempPkg1 = format fp (oOutputDir </> pkg)
+    tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
+    pkgargs :: [ T.Text ]
+    pkgargs =
+         [ "--identifier", dcPkgName
+         , "--component", tt componentRoot
+         , "--install-location", "/Applications"
+         , tempPkg1
+         ]
 
   mktree oOutputDir
-  with (makeScriptsDir opts darwinConfig) $ \scriptsDir -> do
-    let
-      pkgargs :: [ T.Text ]
-      pkgargs =
-           [ "--identifier"
-           , dcPkgName
-           , "--scripts", scriptsDir
-           , "--component"
-           , tt componentRoot
-           , "--install-location"
-           , "/Applications"
-           , tempPkg1
-           ]
-    run "ls" [ "-ltrh", scriptsDir ]
-    run "pkgbuild" pkgargs
+  run "pkgbuild" pkgargs
 
   run "productbuild" [ "--product", "data/plist"
                      , "--package", tempPkg1