Move LICENSE file, ufetch modifications

Move the license file from UNLICENSE to LICENSE, remove ufetch-debian,
make ufetch uptime output shorter by using "min" instead of "minutes",
"hrs" instead of "hours"

diff --git a/LICENSE b/LICENSE
new file mode 100644 (file)
index 0000000..68a49da
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>

diff --git a/README.md b/README.md
index 53dc1f1b8ae6b4c8e5fb637e7c213687248a540d..579e20f9d5e090ab5878a315ecec77a5ddcccec0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Shell scripts
 Some shell scripts that make my life a bit easier. Most of them are inspired by other people's work and are marked accordingly in the script.
 
-All work in this repository is public domain, if not otherwise specified at the top of the file. See the UNLICENSE file for more information
+All work in this repository is public domain, if not otherwise specified at the top of the file. See the LICENSE file for more information
 

diff --git a/UNLICENSE b/UNLICENSE
deleted file mode 100644 (file)
index 68a49da..0000000
--- a/UNLICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>

diff --git a/ufetch-arch b/ufetch-arch
index d33f6ef50920a839d8a844085dc869146155db76..58b28edd075f91c887c69f6c49efd5184ed9259b 100755 (executable)
--- a/ufetch-arch
+++ b/ufetch-arch
@@ -8,7 +8,10 @@
 host="$(cat /etc/hostname)"
 os="Arch Linux"
 kernel="$(uname -sr)"
-uptime="$(uptime -p | sed 's/up //')"
+uptime="$(uptime -p | sed \
+  -e 's/up //' \
+  -e 's/hours/hrs/' \
+  -e 's/minutes/min/')"
 date="$(date +%Y-%m-%0e)"
 time="$(date +%r)"
 tasks="$(task list due.before:week | tail -n 1 | head -c -7)"

diff --git a/ufetch-debian b/ufetch-debian
deleted file mode 100755 (executable)
index 4a6dee7..0000000
--- a/ufetch-debian
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env sh
-# ufetch-armaan. My customized version of ufetch that doesn't print the ascii
-# art, and focuses on information that changes often. Ufetch was written
-# by jschx (Joe Schillinger), and is ISC licensed.
-# https://gitlab.com/jschx/ufetch
-
-## INFO
-host="$(hostname)"
-os="Debian Unstable"
-kernel="$(uname -sr)"
-uptime="$(uptime -p | sed 's/up //')"
-date="$(date +%Y-%m-%0e)"
-time="$(date +%r)"
-tasks="$(task list due.before:week | tail -n 1 | head -c -7)"
-
-## DEFINE COLORS
-bold='\033[1m'
-white='\033[0;37m'
-reset='\033[0m'
-
-lc="${reset}${bold}${white}"         # labels
-nc="${reset}${bold}${white}"         # user and hostname
-ic="${reset}"                        # info
-
-## OUTPUT
-printf "${nc}${USER}${ic}@${nc}${host}${reset}
-${lc}OS        ${ic}${os}${reset}
-${lc}KERNEL    ${ic}${kernel}${reset}
-${lc}UPTIME    ${ic}${uptime}${reset}
-${lc}DATE      ${ic}${date}${reset}
-${lc}TIME      ${ic}${time}${reset}
-${lc}TASKS     ${ic}${tasks}${reset}
-"