removed MOTD, fixed german

diff --git a/Makefile b/Makefile
index e4adcff80883a48b79cd94f98ea4a31a0bc0b879..cfed2197ff1ec734a346afe36d24735d7f5d394d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,12 @@
 .RECIPEPREFIX := >
 
 install:
->chmod +x src/charsel
+>chmod +x ./charsel
 >mkdir -p /usr/share/charsel/charfiles/
 >cp charfiles/* /usr/share/charsel/charfiles/
 >mkdir /usr/share/doc/charsel
 >cp README.md /usr/share/doc/charsel/
->cp src/motd /usr/share/charsel
->cp src/charsel /usr/bin/
+>cp ./charsel /usr/bin/
 
 uninstall:
 >rm -rf /usr/share/charsel/charfiles/

diff --git a/charfiles/german b/charfiles/german
index 5140b4026bb10cf7249852cde04bdc99b838ab72..9a4725b0c6cef1bebc047116e8beac25d64de9e1 100644 (file)
--- a/charfiles/german
+++ b/charfiles/german
@@ -1,11 +1,11 @@
-A Ä
-O Ö
-U Ü
-S ẞ
+A,Ä
+O,Ö
+U,Ü
+S,ẞ
 ---
-a ä
-o ö
-u ü
-s ß
+a,ä
+o,ö
+u,ü
+s,ß
 
-4 €
+4,€

diff --git a/charsel b/charsel
new file mode 100755 (executable)
index 0000000..24f342f
--- /dev/null
+++ b/charsel
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+# Merge both global and local charfiles
+CHARDIR=~/.cache/charsel
+
+if [[ ! "$(ls -A $CHARDIR)" || ! -d $CHARDIR ]]; then
+  mkdir $CHARDIR/
+  cp -R /usr/share/charsel/* $CHARDIR/
+  cp -R ~/.local/share/charsel/* $CHARDIR/
+fi
+
+# Check if user provided an input
+if [ $1 = "list" ]; then
+  echo "The following charfiles are installed"
+  ls $CHARDIR/charfiles
+  exit
+elif [[ $1 = "help" || $1 = "-h" || $1 = "--help" || $# -ne 1 ]]; then
+  cat /usr/share/doc/charsel/README.md
+  exit
+else
+
+# Clear screen
+clear
+
+# Define charfile path
+CHARFILE=$CHARDIR/charfiles/$1
+
+# Define length of shortcut
+LENGTH=$(cat $CHARFILE | cut -f 1 -d ',' -s | wc -L | cut -b 1)
+
+# Main program
+while :
+do
+  # Put charfile into table, showing only the shortcuts below the divider in the charfile
+  cat $CHARFILE | grep -A 100 - | tail -n +2 | column -t  --output-separator ' | ' --separator ','
+
+  # Automatically enter input
+  read -N $LENGTH INPUT
+  
+  # Navigate to the right characther
+  LINENUMBER=$(cut -f 1 -d ',' -s $CHARFILE | grep -n $INPUT | cut -d : -f 1)
+  OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE | head -$LINENUMBER | tail +$LINENUMBER)
+  # Clear screen
+  clear
+
+  # Copy output to clipboard
+  echo $OUTPUT | xclip -selection clipboard
+done
+
+fi

diff --git a/src/charsel b/src/charsel
deleted file mode 100755 (executable)
index 84c0aff..0000000
--- a/src/charsel
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-# Merge both global and local charfiles
-CHARDIR=~/.cache/charsel
-
-if [[ ! "$(ls -A $CHARDIR)" || ! -d $CHARDIR ]]; then
-  mkdir $CHARDIR/
-  cp -R /usr/share/charsel/* $CHARDIR/
-  cp -R ~/.local/share/charsel/* $CHARDIR/
-fi
-
-# Check if user provided an input
-if [ $1 = "list" ]; then
-  echo "The following charfiles are installed"
-  ls $CHARDIR/charfiles
-  exit
-elif [[ $1 = "help" || $1 = "-h" || $1 = "--help" || $# -ne 1 ]]; then
-  cat /usr/share/doc/charsel/README.md
-  exit
-else
-
-# Clear screen
-clear
-
-# Define charfile path
-CHARFILE=$CHARDIR/charfiles/$1
-
-# Define length of shortcut
-LENGTH=$(cat $CHARFILE | cut -f 1 -d ',' -s | wc -L | cut -b 1)
-
-# MOTD
-cat $CHARDIR/motd
-
-# Main program
-while :
-do
-  # Put charfile into table, showing only the shortcuts below the divider in the charfile
-  cat $CHARFILE | grep -A 100 - | tail -n +2 | column -t  --output-separator ' | ' --separator ','
-
-  # Automatically enter input
-  read -N $LENGTH INPUT
-  
-  # Navigate to the right characther
-  LINENUMBER=$(cut -f 1 -d ',' -s $CHARFILE | grep -n $INPUT | cut -d : -f 1)
-  OUTPUT=$(cut -f 2 -d ',' -s $CHARFILE | head -$LINENUMBER | tail +$LINENUMBER)
-  # Clear screen
-  clear
-
-  # Copy output to clipboard
-  echo $OUTPUT | xclip -selection clipboard
-done
-
-fi

diff --git a/src/motd b/src/motd
deleted file mode 100644 (file)
index 3936842..0000000
--- a/src/motd
+++ /dev/null
@@ -1,3 +0,0 @@
-WELCOME TO CHARSEL!
-FOR HELP, PLEASE USE `charsel help`
-