From 2a30d923196c135f5d02e56e3e840d2d1fb3140e Mon Sep 17 00:00:00 2001 From: Tslil Clingman Date: Fri, 30 Jan 2015 23:22:18 +0200 Subject: VCS should now be sh(1) compatible --- vcs | 16 ++++++++-------- wls | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vcs b/vcs index d68d07c..cf72f04 100755 --- a/vcs +++ b/vcs @@ -1,7 +1,7 @@ -#!/bin/zsh +#!/usr/bin/env sh check() { - echo $1 | grep -q $2; + echo "$2" | grep -q "$1"; }; VCS_STR="" @@ -17,12 +17,12 @@ rstr=" %F{28}●%f" if [[ -d ".git" || -d "../.git" || -d "../../.git" ]]; then outp=$(git status) VCS_STR="×" - VCS_INF=$(echo $outp | head -n 1 | cut -d' ' -f 3-) - check $outp "^Untracked files:$" + VCS_INF=$(echo "$outp" | head -n 1 | cut -d' ' -f 3-) + check "^Untracked files:$" "$outp" [[ $? = 0 ]] && VCS_NEW=$nstr - check $outp "^Changes not staged for commit:$" + check "^Changes not staged for commit:$" "$outp" [[ $? = 0 ]] && VCS_MOD=$mstr - check $outp "^Changes to be committed:$" + check "^Changes to be committed:$" "$outp" [[ $? = 0 ]] && VCS_REC=$rstr else if [[ -d "_darcs" || -d "../_darcs" || -d "../../_darcs" ]]; then fls=$(darcs show files) @@ -30,7 +30,7 @@ else if [[ -d "_darcs" || -d "../_darcs" || -d "../../_darcs" ]]; then VCS_INF=$(darcs show repo | grep Default | cut -d : -f 3-) for f in ./*; do if [[ -f $f ]]; then - echo $fls | grep -q $f + echo "$fls" | grep -q $f else true fi; @@ -40,7 +40,7 @@ else if [[ -d "_darcs" || -d "../_darcs" || -d "../../_darcs" ]]; then fi; done; news=$(darcs what)$ - check $news "^No changes" + check "^No changes" "$news" [[ $? = 0 ]] || VCS_REC=$rstr fi; fi; diff --git a/wls b/wls index dc6db1c..1785678 100755 --- a/wls +++ b/wls @@ -5,7 +5,7 @@ dird="${HOME}/.config/wireless" sudo killall wpa_supplicant &> /dev/null -sudo dhcpcd -k wlan0 &> /dev/null +sudo dhcpcd -k wlp2s2 &> /dev/null ls $dird echo -n "--> " @@ -22,6 +22,6 @@ if [ ! -f "$dird/$ssid" ]; then fi; fi; -sudo wpa_supplicant -B -i wlan0 -c "$dird/$ssid" +sudo wpa_supplicant -B -i wlp2s2 -c "$dird/$ssid" sleep 3s -sudo dhcpcd wlan0 +sudo dhcpcd wlp2s2 -- cgit v1.2.3