瀏覽代碼

Removed typo
Fixed bugs in install.sh script
removed occ commands in .bash_aliases

Sebastian Vendt 2 年之前
父節點
當前提交
7e48b9d74d
共有 2 個文件被更改,包括 5 次插入7 次删除
  1. 2 4
      bashAliases/.bash_aliases
  2. 3 3
      bashAliases/install.sh

+ 2 - 4
bashAliases/.bash_aliases

@@ -1,11 +1,9 @@
-alias occ='sudo -u webadmin /opt/plesk/php/$(/root/scripts/bash-tools/pleskDomain/getPHPHandler.sh cloud.jdav-ulm.de)/bin/php --define apc.enable_cli=1 /var/www/vhosts/jdav-ulm.de/cloud.jdav-ulm.de/occ'
-alias occupgrade='sudo -u webadmin /opt/plesk/php/$(/root/scripts/bash-tools/pleskDomain/getPHPHandler.sh cloud.jdav-ulm.de)/bin/php --define apc.enable_cli=1 /var/www/vhosts/jdav-ulm.de/cloud.jdav-ulm.de/updater/updater.phar'
 alias nano='nano -l'
 alias ll='ls -alF' #this is on most shells already standard
 alias g='grep -rniI' #search recursively, case insensitive in files, ignore binary files, output line numbers
 alias r='rm -rf' #remove 
 alias du='du -h -d1' #Disk usage
-alias c="_f(){ if [ -z \"\$1\" ]; then cd && ll; elif [ -d \"\$1\" ]; then cd \"\$1\" && ll; elif [ -f \"\$1\" ]; then $EDITOR \"\$@\"; else cd \`var=\"\$1\"; cat ~/bookmarks | awk -v var="\$var" '\$0 ~ var {print \$2;exit}'\`; ll; fi; unset -f _f; }; _f" # enter and list if directory and open in editor if file
+alias c="_f(){ if [ -z \"\$1\" ]; then cd && ll; elif [ -d \"\$1\" ]; then cd \"\$1\" && ll; elif [ -f \"\$1\" ]; then nano \"\$@\"; else cd \`var=\"\$1\"; cat ~/bookmarks | awk -v var="\$var" '\$0 ~ var {print \$2;exit}'\`; ll; fi; unset -f _f; }; _f" # enter and list if directory and open in editor if file
 alias u='_f(){ for i in `seq 1 $1`; do cd ..; done; ll; unset -f _f; }; _f' # go N directoies up
-alias o='$EDITOR -l'
+alias o='nano -l'
 alias s='_f(){ for char in `echo "$1" | grep -o .`; do pattern="$pattern.*$char"; done; grep $3 -E "$pattern" "$2"; unset pattern; unset -f _f; }; _f' # like alias g but fuzzy search

+ 3 - 3
bashAliases/install.sh

@@ -2,7 +2,7 @@
 
 aliasFile=~/.bash_aliases
 
-echo "Instal location: $aliasFile"
+echo "Install location: $aliasFile"
 echo ""
 if [ -f "$aliasFile" ]; then
     source "$aliasFile"
@@ -10,12 +10,12 @@ else
     touch "$aliasFile"
 fi
 
-while read line; do
+while read -r line; do
   if [[ $line == alias\ * ]]; then
     alias_name=${line#alias } # remove the "alias " prefix
     alias_name=${alias_name%%=*} # remove everything after the "=" character
     if alias $alias_name 2>/dev/null | wc -l | grep -q '^0$' ; then
-        echo "$line" >> "$aliasFile"
+        printf '%s\n' "$line" >> "$aliasFile"
         printf "%.20s%s\n" "$alias_name......................." "Installed"
     else
         printf "%.21s%s\n" "$alias_name......................." "Skipping"