git.iko.soy/obelisk
on master help sign in
command: Clean some lint
ee1efffElliot Cameron
lib/command/src/Obelisk/Command/Deploy.hs+2−2
compare with master
unifiedsplit
@@ -82,7 +82,7 @@ deployInit thunkPtr deployDir sshKeyPath hostnames route adminEmail enableHttps
82 writeDeployConfig deployDir "backend_hosts" $ unlines hostnames
82 writeDeployConfig deployDir "backend_hosts" $ unlines hostnames
83 writeDeployConfig deployDir "enable_https" $ show enableHttps
83 writeDeployConfig deployDir "enable_https" $ show enableHttps
84 writeDeployConfig deployDir "admin_email" adminEmail
84 writeDeployConfig deployDir "admin_email" adminEmail
85− writeDeployConfig deployDir ("config" </> "common" </> "route") $ route
85+ writeDeployConfig deployDir ("config" </> "common" </> "route") route
86 withSpinner "Creating source thunk (./src)" $ liftIO $ do
86 withSpinner "Creating source thunk (./src)" $ liftIO $ do
87 createThunk (deployDir </> "src") thunkPtr
87 createThunk (deployDir </> "src") thunkPtr
88 setupObeliskImpl deployDir
88 setupObeliskImpl deployDir
@@ -219,7 +219,7 @@ deployMobile platform mobileArgs = withProjectRoot "." $ \root -> do
219 , _keytoolConfig_storepass = keyStorePassword
219 , _keytoolConfig_storepass = keyStorePassword
220 , _keytoolConfig_keypass = keyStorePassword
220 , _keytoolConfig_keypass = keyStorePassword
221 }
221 }
222− createKeystore root $ keyToolConf
222+ createKeystore root keyToolConf
223 liftIO $ BSL.writeFile keytoolConfPath $ encode keyToolConf
223 liftIO $ BSL.writeFile keytoolConfPath $ encode keyToolConf
224 checkKeytoolConfExist <- liftIO $ doesFileExist keytoolConfPath
224 checkKeytoolConfExist <- liftIO $ doesFileExist keytoolConfPath
225 unless checkKeytoolConfExist $ failWith "Missing android KeytoolConfig"
225 unless checkKeytoolConfExist $ failWith "Missing android KeytoolConfig"
lib/command/src/Obelisk/Command/Thunk.hs+1−1
@@ -540,7 +540,7 @@ nixBuildThunkAttrWithCache thunkDir attr = do
540 Just c -> return c
540 Just c -> return c
541 Nothing -> do
541 Nothing -> do
542 putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
542 putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
543− _ <- nixCmd $ NixCmd_Build$ def
543+ _ <- nixCmd $ NixCmd_Build $ def
544 Lens.& nixBuildConfig_outLink Lens..~ OutLink_IndirectRoot cachePath
544 Lens.& nixBuildConfig_outLink Lens..~ OutLink_IndirectRoot cachePath
545 Lens.& nixCmdConfig_target Lens..~ Target
545 Lens.& nixCmdConfig_target Lens..~ Target
546 { _target_path = Just thunkDir
546 { _target_path = Just thunkDir