Move definition of ls and ll from _nyagos to nyagos.d/aliases.lua

nyaosorg · Aug 8, 2020 · 4e9c06b · 4e9c06b
1 parent b963f96
commit 4e9c06b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/_nyagos b/_nyagos
@@ -1,15 +1,6 @@
 # This is a configuration for NYAGOS
 # The syntax is like a batchfile of command.com.
 
-if "%OS%" == "Windows_NT" then
-    alias "ls=__ls__ -oFh $*"
-    alias "ll=__ls__ -olFh $*"
-    alias "wordpad=""%PROGRAMFILES%\Windows NT\Accessories\wordpad.exe"""
-    set NUL=nul
-else
-    set NUL=/dev/null
-endif
-
 if     "%OS%" == "Windows_NT" set "PROMPT=$L%COMPUTERNAME%:$P$G$_$$$s"
 if not "%OS%" == "Windows_NT" set "PROMPT=$L%NAME%:$P$G$_$$$s"
 

diff --git a/nyagos.d/aliases.lua b/nyagos.d/aliases.lua
@@ -78,3 +78,11 @@ function nyagos.alias.chompf(args)
         end
     end
 end
+
+if nyagos.env.OS == "Windows_NT" then
+    nyagos.alias.ls="__ls__ -oFh $*"
+    nyagos.alias.ll="__ls__ -olFh $*"
+    nyagos.alias.wordpad=
+        '"' .. nyagos.pathjoin( nyagos.env.PROGRAMFILES ,
+        'Windows NT\\Accessories\\wordpad.exe' ) .. '"'
+end