mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-16 02:22:12 +03:00
Default to the bootstrap pill of the current urbit version.
Also set the version number of king in lockstep with vere.
This commit is contained in:
parent
e9063f926b
commit
29a471c3df
pkg/king
@ -39,8 +39,6 @@ data PillSource
|
||||
deriving (Show)
|
||||
|
||||
data New = New
|
||||
-- TODO: Pill path needs to become optional; need to default to either the
|
||||
-- git hash version or the release version per current vere.
|
||||
{ nPillSource :: PillSource
|
||||
, nPierPath :: Maybe FilePath -- Derived from ship name if not specified.
|
||||
, nArvoDir :: Maybe FilePath
|
||||
@ -133,6 +131,11 @@ parseArgs = do
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
defaultPillURL :: String
|
||||
defaultPillURL = "https://bootstrap.urbit.org/urbit-" <> VERSION_king <> ".pill"
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
newComet :: Parser BootType
|
||||
newComet = flag' BootComet
|
||||
( long "comet"
|
||||
@ -164,12 +167,9 @@ pillFromURL = PillSourceURL <$> strOption
|
||||
( short 'u'
|
||||
<> long "pill-url"
|
||||
<> metavar "URL"
|
||||
<> value defaultPillURL
|
||||
<> help "URL to pill file")
|
||||
|
||||
-- pillFromDefaultURL :: Parser PillSource
|
||||
-- pillFromDefaultURL = value $
|
||||
-- PillSourceURL "https://bootstrap.urbit.org/urbit-0.9.0.pill"
|
||||
|
||||
new :: Parser New
|
||||
new = do
|
||||
nPierPath <- optional
|
||||
@ -179,7 +179,7 @@ new = do
|
||||
|
||||
nBootType <- newComet <|> newFakeship <|> newFromKeyfile
|
||||
|
||||
nPillSource <- pillFromPath <|> pillFromURL -- <|> pillFromDefaultURL
|
||||
nPillSource <- pillFromPath <|> pillFromURL
|
||||
|
||||
nLite <- switch
|
||||
$ short 'l'
|
||||
|
@ -1,5 +1,5 @@
|
||||
name: king
|
||||
version: 0.1.0
|
||||
version: 0.9.0
|
||||
license: AGPL-3.0-only
|
||||
|
||||
flags:
|
||||
|
Loading…
Reference in New Issue
Block a user