commit 2422940b16479ccfb43816a077f9d50a30dd0311
parent 71513e09a6010045ac3b0c0f1bf6b625a6069e3b
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date: Wed, 25 Feb 2026 22:35:02 +0100
Cleanup janet code; can compile some things now
Diffstat:
| M | instowl.janet | | | 154 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- |
1 file changed, 115 insertions(+), 39 deletions(-)
diff --git a/instowl.janet b/instowl.janet
@@ -1,76 +1,152 @@
#!/usr/bin/env janet
(import spork/sh)
-(import spork/path)
(ffi/context nil)
-(ffi/defbind mkdtemp :ptr [template :ptr])
(ffi/defbind get_nprocs :int [])
+(ffi/defbind-alias dirname libc/dirname :string [path :ptr])
+(ffi/defbind-alias basename libc/basename :string [path :ptr])
+(ffi/defbind-alias mkdtemp libc/mkdtemp :string [template :ptr])
+
+(defn dirname [path]
+ (libc/dirname (string/join [path])))
+
+(defn basename [path]
+ (libc/basename (string/join [path])))
+
+(defn mkdtemp [template]
+ (libc/mkdtemp (string/join [template "XXXXXX"])))
(def spinner "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏")
(var ch (string/slice spinner 0 3))
-(defn rotate
- [ch]
+(defn rotate [ch]
(def nxt (+ 3 (string/find ch spinner)))
- (if (= nxt (length spinner)) (string/slice spinner 0 3) (string/slice spinner nxt (+ nxt 3))))
+ (if (= nxt (length spinner))
+ (string/slice spinner 0 3)
+ (string/slice spinner nxt (+ nxt 3))))
(defn file-exists? [path]
(not (nil? (os/stat path))))
+(defn msg [state line logfile]
+ (file/write logfile line "\n")
+ (prinf "\x1b[2K{%s}⸉%s⸊→%s\r" state ch (string/slice line 0 (min 80 (length line))))
+ (flush))
+
(defn prinfer [state logfile pipe]
- (do
- (def buf @"")
- (while (ev/read pipe 1024 buf)
- (def lines (string/split "\n" buf))
- (def len (length lines))
- (if (> len 1)
- (loop [[idx line] :pairs lines]
- (if (< idx (- len 1))
- (do
- (file/write logfile line "\n")
- (prinf "\x1b[2K{%s}⸉%s⸊→%s\r" state ch (string/slice line 0 (min 80 (length line))))
- (flush))
- (do (buffer/clear buf) (buffer/push-string buf line))))))))
+ (def buf @"")
+ (while (ev/read pipe 1024 buf)
+ (def lines (string/split "\n" buf))
+ (def len (length lines))
+ (if (> len 1)
+ (loop [[idx line] :pairs lines]
+ (if (< idx (- len 1))
+ (msg state line logfile)
+ (do
+ (buffer/clear buf)
+ (buffer/push-string buf line)))))))
-(defn runp
- [state & args]
+(defn runp [state & args]
(def proc (os/spawn args : {:out :pipe :err :pipe}))
(def logfile (file/open "./instowl.log" :a))
(ev/gather
(prinfer state logfile (proc :out))
(prinfer state logfile (proc :err))
(os/proc-wait proc)
- (while (= (get proc :return-code) nil) (ev/sleep 0.2) (do
- (set ch (rotate ch))
- (prinf "{%s}⸉%s⸊\r" state ch)
- (flush))))
+ (while (= (get proc :return-code) nil)
+ (ev/sleep 0.2)
+ (set ch (rotate ch))
+ (prinf "{%s}⸉%s⸊\r" state ch)
+ (flush)))
(def code (get proc :return-code))
(os/proc-close proc)
(file/close logfile)
code)
-(defn main
- [& args]
+(defmacro checkrun [newstate & args]
+ ~(if (= (runp state ,;args) 0)
+ (set state ,newstate)
+ (set state :error)))
+
+(defmacro iff [&opt condition iftrue & rest]
+ (if (nil? iftrue) condition ~(if ,condition ,iftrue (iff ,;rest))))
+
+(defn dir-exists? [path]
+ (= (os/stat path :mode) :directory))
+
+(defn mkdirp [path]
+ (if (not (dir-exists? path)) (do (mkdirp (dirname path)) (os/mkdir path))))
+
+(defn move-file [src dst]
+ (mkdirp (dirname dst))
+ (os/rename src dst))
+
+(defn main [& args]
(do
(def target (string/join [(os/getenv "HOME") "/.local"]))
(def stowdir (string/join [target "/pkg"]))
- (def pkg (path/basename (os/getenv "PWD")))
- (def pkgdir (string/join [stowdir "/" pkg ]))
- (def destdir @"/tmp/instowl.XXXXXX")
+ (def pkg (basename (os/getenv "PWD")))
+ (def pkgdir (string/join [stowdir "/" pkg]))
+ (def destdir (mkdtemp "/tmp/instowl."))
+ (sh/rm "./instowl.log")
(var prefix target)
(var state :init)
(while (not= state :exit)
(case state
- :init (if (file-exists? "configure.ac") (set state :conf/autotools) (set state :conf/configure))
- :conf/autotools (if (= (runp state "/usr/bin/autoreconf" "-vi") 0) (set state :conf/configure) (set state :error))
- :conf/configure (if (= (runp state "./configure" "--prefix" prefix) 0) (set state :build/make) (set state :error))
- :build/make (if (= (runp state "/usr/bin/make") 0) (set state :install/pre) (set state :error))
- :install/pre (do (sh/create-dirs pkgdir) (mkdtemp destdir) (set state :install/make))
- :install/make (if (= (runp state "/usr/bin/make" "install" (string/format "-j%d" (get_nprocs)) (string/join ["DESTDIR=" destdir])) 0) (set state :install/post) (set state :error))
- :install/post (do (def installdir (string/join [destdir prefix])) (loop [file :in (sh/list-all-files installdir)] (sh/copy-file file (string/replace installdir pkgdir file))) (set state :stow))
- :stow (if (= (runp state "/usr/bin/xstow" "-v" "-d" stowdir "-t" target pkg) 0) (set state :done) (set state :error))
- :error (do (printf "\x1b[2K⸉!⸊→Error") (set state :exit))
- :done (do (printf "\x1b[2K⸉x⸊→Done") (set state :exit))))))
+ :init
+ (iff
+ (file-exists? "configure") (set state :conf/configure)
+ (file-exists? "configure.ac") (set state :conf/autotools)
+ (set state :error))
+
+ :conf/autotools
+ (checkrun :conf/configure "/usr/bin/autoreconf" "-vi")
+
+ :conf/configure
+ (checkrun :build/make "./configure" (string/join ["--prefix=" prefix]))
+
+ :build/make
+ (checkrun :install/pre "/usr/bin/make" (string/format "-j%d" (get_nprocs)))
+
+ :install/pre
+ (do
+ (set state :install/make))
+
+ :install/make
+ (checkrun :install/post
+ "/usr/bin/make"
+ "install"
+ (string/join ["DESTDIR=" destdir])
+ (string/join ["PREFIX=" prefix]))
+
+ :install/post
+ (do
+ (def logfile (file/open "./instowl.log" :a))
+ (def installdir (string/join [destdir prefix]))
+ (if (dir-exists? installdir)
+ (do
+ (loop [file :in (sh/list-all-files installdir)]
+ (def dst (string/replace installdir pkgdir file))
+ (msg state (string/format "MV %s -> %s" file dst) logfile)
+ (move-file file dst))
+ (file/close logfile)
+ (set state :stow))
+ (set state :error)))
+
+ :stow
+ (checkrun :done "/usr/bin/stow" "-vv" "-d" stowdir "-t" target pkg)
+
+ :error
+ (do
+ (sh/rm (string/join [destdir]))
+ (printf "\x1b[2K⸉!⸊→Error")
+ (set state :exit))
+
+ :done
+ (do
+ (sh/rm (string/join [destdir]))
+ (printf "\x1b[2K⸉x⸊→Done")
+ (set state :exit))))))
