git.iko.soy/obelisk
on master help sign in
command: Clean some lint
commitee1efff8a3ac890e736f504d835a01920767c128 authorElliot Cameron <eacameron@gmail.com> dateTue 24 Dec 2019, 17:36 (7 years ago) parentcb3c2a6
2 files changed+3−3
compare with master
unifiedsplit
lib/command/src/Obelisk/Command/Deploy.hs+2−2 lib/command/src/Obelisk/Command/Thunk.hs+1−1
lib/command/src/Obelisk/Command/Deploy.hs+2−2
@@ -82,7 +82,7 @@ deployInit thunkPtr deployDir sshKeyPath hostnames route adminEmail enableHttps
8282 writeDeployConfig deployDir "backend_hosts" $ unlines hostnames
8383 writeDeployConfig deployDir "enable_https" $ show enableHttps
8484 writeDeployConfig deployDir "admin_email" adminEmail
85− writeDeployConfig deployDir ("config" </> "common" </> "route") $ route
85+ writeDeployConfig deployDir ("config" </> "common" </> "route") route
8686 withSpinner "Creating source thunk (./src)" $ liftIO $ do
8787 createThunk (deployDir </> "src") thunkPtr
8888 setupObeliskImpl deployDir
@@ -219,7 +219,7 @@ deployMobile platform mobileArgs = withProjectRoot "." $ \root -> do
219219 , _keytoolConfig_storepass = keyStorePassword
220220 , _keytoolConfig_keypass = keyStorePassword
221221 }
222− createKeystore root $ keyToolConf
222+ createKeystore root keyToolConf
223223 liftIO $ BSL.writeFile keytoolConfPath $ encode keyToolConf
224224 checkKeytoolConfExist <- liftIO $ doesFileExist keytoolConfPath
225225 unless checkKeytoolConfExist $ failWith "Missing android KeytoolConfig"
lib/command/src/Obelisk/Command/Thunk.hs+1−1
@@ -540,7 +540,7 @@ nixBuildThunkAttrWithCache thunkDir attr = do
540540 Just c -> return c
541541 Nothing -> do
542542 putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
543− _ <- nixCmd $ NixCmd_Build$ def
543+ _ <- nixCmd $ NixCmd_Build $ def
544544 Lens.& nixBuildConfig_outLink Lens..~ OutLink_IndirectRoot cachePath
545545 Lens.& nixCmdConfig_target Lens..~ Target
546546 { _target_path = Just thunkDir