commit c4679565c1bd87c914e6b48b65f790a3a5f4876a · patrick.sirref.org/shelter

+15

README.md

···

       3
       3
        
       

     

       4
       4
        
       A shell session shim that makes exploring from the terminal a little bit easier.

     

       5
       5
        
       

     

       6
       6
       +
       ## Up and running

     

       7
       7
       +
       

     

       8
       8
       +
       To test shelter locally you feel need a ZFS pool, for now you must name it `shelter`.

     

       9
       9
       +
       

     

       10
       10
       +
       ```

     

       11
       11
       +
       $ truncate --size=10G /var/shelter.img

     

       12
       12
       +
       $ sudo zpool create shelter /var/shelter.img 

     

       13
       13
       +
       $ sudo -E dune exec -- shelter

     

       14
       14
       +
       ```

     

       15
       15
       +
       

     

       16
       16
       +
       Sometimes you want to just restart the world.

     

       17
       17
       +
       

     

       18
       18
       +
       ```

     

       19
       19
       +
       $ sudo zpool destroy shelter && sudo zpool create shelter /var/shelter.img && sudo rm -rf ~/.cache/shelter

     

       20
       20
       +
       ```

+5 -5

src/bin/main.ml

···

       11
       11
        
       let home = Unix.getenv "HOME"

     

       12
       12
        
       

     

       13
       13
        
       let state_dir fs type' =

     

       14
       14
       -
         let path = Eio.Path.(fs / home / ".cache/cshell" / type') in

     

       14
       14
       +
         let path = Eio.Path.(fs / home / ".cache/shelter" / type') in

     

       15
       15
        
         Eio.Path.mkdirs ~exists_ok:true ~perm:0o755 path;

     

       16
       16
        
         path

     

       17
       17
        
       

     
···

       19
       19
        
         Eio_posix.run @@ fun env ->

     

       20
       20
        
         Fmt_tty.setup_std_outputs ();

     

       21
       21
        
         match Sys.argv.(1) with

     

       22
       22
       -
         | "shelter" ->

     

       23
       23
       -
             let dir = state_dir env#fs "shelter" in

     

       24
       24
       -
             Shelter.main env#fs env#clock env#process_mgr dir

     

       25
       25
       -
         | _ | (exception Invalid_argument _) ->

     

       22
       22
       +
         | "passthrough" ->

     

       26
       23
        
             let dir = state_dir env#fs "passthrough" in

     

       27
       24
        
             Pass.main env#fs env#clock env#process_mgr dir

     

       25
       25
       +
         | _ | (exception Invalid_argument _) ->

     

       26
       26
       +
             let dir = state_dir env#fs "shelter" in

     

       27
       27
       +
             Shelter.main env#fs env#clock env#process_mgr dir

+2 -2

src/lib/passthrough/shelter_passthrough.ml

···

       10
       10
        
       let () = Fmt.set_style_renderer Format.str_formatter `Ansi_tty

     

       11
       11
        
       

     

       12
       12
        
       let prompt _ _ =

     

       13
       13
       -
         Fmt.(styled (`Fg `Red) string) Format.str_formatter "cshell> ";

     

       13
       13
       +
         Fmt.(styled (`Fg `Red) string) Format.str_formatter "shelter-p> ";

     

       14
       14
        
         Format.flush_str_formatter ()

     

       15
       15
        
       

     

       16
       16
        
       let history_key = [ "history" ]

     
···

       38
       38
        
              full_store),

     

       39
       39
        
             () ) (Exec command) =

     

       40
       40
        
         let info () =

     

       41
       41
       -
           S.Info.v ~message:"cshell" (Eio.Time.now clock |> Int64.of_float)

     

       41
       41
       +
           S.Info.v ~message:"shelter" (Eio.Time.now clock |> Int64.of_float)

     

       42
       42
        
         in

     

       43
       43
        
         let cmd =

     

       44
       44
        
           String.split_on_char ' ' command

+1 -1

src/lib/shelter/shelter_main.ml

···

       161
       161
        
       type ctx = Store.t

     

       162
       162
        
       

     

       163
       163
        
       let init fs proc s =

     

       164
       164
       -
         let store = Store.init fs proc "test-pool" in

     

       164
       164
       +
         let store = Store.init fs proc "shelter" in

     

       165
       165
        
         List.iter

     

       166
       166
        
           (fun (_, { History.args; _ }) ->

     

       167
       167
        
             LNoise.history_add (String.concat " " args) |> ignore)