From 4ccd48ca2cbcbe1fe3aaef9491a3d1877ac89833 Mon Sep 17 00:00:00 2001 From: a Date: Mon, 31 Oct 2016 19:58:03 +0100 Subject: [PATCH] gsed is required in BSD,I give up fighting the BSD sed version --- Makefile.skel | 6 +++--- README.md | 21 ++++++++++++++------- doc/pinkybar.1 | 21 ++++++++++++++------- doc/pinkybar.texi | 21 ++++++++++++++------- 4 files changed, 45 insertions(+), 24 deletions(-) diff --git a/Makefile.skel b/Makefile.skel index 6d94f1e..39061fe 100644 --- a/Makefile.skel +++ b/Makefile.skel @@ -34,15 +34,15 @@ endef # The BSD sed version # do require '' define reflace - @sed -i $(2) -e $(1) + @sed -i -e $(1) $(2) endef define reflace2 - @sed -i $(3) -e 's|$(1)|$(2)|g' + @sed -i -e 's|$(1)|$(2)|g' $(3) endef define reflace3 - @sed -i $(5) -e 's|$(1)|$(2)|g' -e 's|$(3)|$(4)|g' + @sed -i -e 's|$(1)|$(2)|g' -e 's|$(3)|$(4)|g' $(5) endef diff --git a/README.md b/README.md index 65d0bc0..71bacca 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,8 @@ Don't just rush to register yourself, read carefully what the "Free" account lim ## Installation for dwm ```bash -bash bootstrap distro +chmod +x bootstrap +./bootstrap distro ./configure --prefix=$HOME/.cache --with-x11 make make install @@ -221,7 +222,8 @@ Copy the code from extra/scripts/dwm.sh or `exec` it from **xinitrc** or the scr mkdir -p --mode=700 $HOME/.xmonad/icons cp -r extra/xbm_icons/*.xbm $HOME/.xmonad/icons -bash bootstrap distro +chmod +x bootstrap +./bootstrap distro # disable X11, point the location to the icons ./configure --prefix=$HOME/.cache --without-x11 icons=$HOME/.xmonad/icons @@ -259,7 +261,9 @@ Copy only 'dev.MODULE.NUMBER' (if there is any number at all) and paste it into Do the same for your cpu temperature, copy and paste the variable as is. **dev.cpu.0.temperature** below is provied as example. ```bash -bash bootstrap freebsd +sed -i 's/@sed/@gsed/g' Makefile.skel +chmod +x bootstrap +./bootstrap freebsd ./configure --prefix=$HOME/.cache --with-x11 --without-alsa --with-oss mobo_sensor='dev.aibs.0' cpu_sensor='dev.cpu.0.temperature' make make install @@ -275,6 +279,7 @@ Before even executing the **bootstrap** script, you'll have to do this: # To detect the newer compiler that you are # about to install sed -i 's/#AC_PROG_CC(/AC_PROG_CC(/g' configure.ac +sed -i 's/@sed/@gsed/g' Makefile.skel ls /usr/local/bin/automake-* ls /usr/local/bin/autoconf-* @@ -290,7 +295,8 @@ pkg_add gcc ## pinky curses installation ```bash -bash bootstrap distro +chmod +x bootstrap +./bootstrap distro # disable X11, enable the colours and ncurses opts. ./configure --prefix=$HOME/.cache --without-x11 --with-alsa --with-colours --with-ncurses @@ -320,7 +326,8 @@ pinky-bar is no longer tied to Window Managers only. With the addition of "witho The installation steps: ```bash -bash bootstrap distro +chmod +x bootstrap +./bootstrap distro ./configure --prefix=$HOME/.cache --without-x11 --without-colours make make install @@ -398,9 +405,9 @@ Execute the program without supplying any command line options and it will parse * libtool * m4 * gawk -* sed +* gsed * perl -* gnu make +* gmake Some llvm and gcc versions will not check for headers and libraries in /usr/local, if that's the case for you, you should export the following environment variables: diff --git a/doc/pinkybar.1 b/doc/pinkybar.1 index 912d7bb..2258072 100644 --- a/doc/pinkybar.1 +++ b/doc/pinkybar.1 @@ -797,7 +797,8 @@ I'm not responsible if you exceeded the limits, you've been warned. .IP .nf \f[C] -bash\ bootstrap\ distro +chmod\ +x\ bootstrap +\&./bootstrap\ distro \&./configure\ \-\-prefix=$HOME/.cache\ \-\-with\-x11 make make\ install @@ -814,7 +815,8 @@ Copy the code from extra/scripts/dwm.sh or \f[C]exec\f[] it from mkdir\ \-p\ \-\-mode=700\ $HOME/.xmonad/icons cp\ \-r\ extra/xbm_icons/*.xbm\ $HOME/.xmonad/icons -bash\ bootstrap\ distro +chmod\ +x\ bootstrap +\&./bootstrap\ distro #\ disable\ X11,\ point\ the\ location\ to\ the\ icons \&./configure\ \-\-prefix=$HOME/.cache\ \-\-without\-x11\ icons=$HOME/.xmonad/icons @@ -864,7 +866,9 @@ Do the same for your cpu temperature, copy and paste the variable as is. .IP .nf \f[C] -bash\ bootstrap\ freebsd +sed\ \-i\ \[aq]s/\@sed/\@gsed/g\[aq]\ Makefile.skel +chmod\ +x\ bootstrap +\&./bootstrap\ freebsd \&./configure\ \-\-prefix=$HOME/.cache\ \-\-with\-x11\ \-\-without\-alsa\ \-\-with\-oss\ mobo_sensor=\[aq]dev.aibs.0\[aq]\ cpu_sensor=\[aq]dev.cpu.0.temperature\[aq] make make\ install @@ -883,6 +887,7 @@ this: #\ To\ detect\ the\ newer\ compiler\ that\ you\ are #\ about\ to\ install sed\ \-i\ \[aq]s/#AC_PROG_CC(/AC_PROG_CC(/g\[aq]\ configure.ac +sed\ \-i\ \[aq]s/\@sed/\@gsed/g\[aq]\ Makefile.skel ls\ /usr/local/bin/automake\-* ls\ /usr/local/bin/autoconf\-* @@ -899,7 +904,8 @@ pkg_add\ gcc .IP .nf \f[C] -bash\ bootstrap\ distro +chmod\ +x\ bootstrap +\&./bootstrap\ distro #\ disable\ X11,\ enable\ the\ colours\ and\ ncurses\ opts. \&./configure\ \-\-prefix=$HOME/.cache\ \-\-without\-x11\ \-\-with\-alsa\ \-\-with\-colours\ \-\-with\-ncurses @@ -941,7 +947,8 @@ The installation steps: .IP .nf \f[C] -bash\ bootstrap\ distro +chmod\ +x\ bootstrap +\&./bootstrap\ distro \&./configure\ \-\-prefix=$HOME/.cache\ \-\-without\-x11\ \-\-without\-colours make make\ install @@ -1053,11 +1060,11 @@ m4 .IP \[bu] 2 gawk .IP \[bu] 2 -sed +gsed .IP \[bu] 2 perl .IP \[bu] 2 -gnu make +gmake .PP Some llvm and gcc versions will not check for headers and libraries in /usr/local, if that's the case for you, you should export the following diff --git a/doc/pinkybar.texi b/doc/pinkybar.texi index 0fa30ef..749fe39 100644 --- a/doc/pinkybar.texi +++ b/doc/pinkybar.texi @@ -572,7 +572,8 @@ you've been warned. @anchor{#installation-for-dwm} @verbatim -bash bootstrap distro +chmod +x bootstrap +./bootstrap distro ./configure --prefix=$HOME/.cache --with-x11 make make install @@ -590,7 +591,8 @@ Copy the code from extra/scripts/dwm.sh or @code{exec} it from mkdir -p --mode=700 $HOME/.xmonad/icons cp -r extra/xbm_icons/*.xbm $HOME/.xmonad/icons -bash bootstrap distro +chmod +x bootstrap +./bootstrap distro # disable X11, point the location to the icons ./configure --prefix=$HOME/.cache --without-x11 icons=$HOME/.xmonad/icons @@ -636,7 +638,9 @@ Do the same for your cpu temperature, copy and paste the variable as is. @strong{dev.cpu.0.temperature} below is provied as example. @verbatim -bash bootstrap freebsd +sed -i 's/@sed/@gsed/g' Makefile.skel +chmod +x bootstrap +./bootstrap freebsd ./configure --prefix=$HOME/.cache --with-x11 --without-alsa --with-oss mobo_sensor='dev.aibs.0' cpu_sensor='dev.cpu.0.temperature' make make install @@ -655,6 +659,7 @@ this: # To detect the newer compiler that you are # about to install sed -i 's/#AC_PROG_CC(/AC_PROG_CC(/g' configure.ac +sed -i 's/@sed/@gsed/g' Makefile.skel ls /usr/local/bin/automake-* ls /usr/local/bin/autoconf-* @@ -672,7 +677,8 @@ pkg_add gcc @anchor{#pinky-curses-installation} @verbatim -bash bootstrap distro +chmod +x bootstrap +./bootstrap distro # disable X11, enable the colours and ncurses opts. ./configure --prefix=$HOME/.cache --without-x11 --with-alsa --with-colours --with-ncurses @@ -712,7 +718,8 @@ information will be shown. The tmux status bar in action: The installation steps: @verbatim -bash bootstrap distro +chmod +x bootstrap +./bootstrap distro ./configure --prefix=$HOME/.cache --without-x11 --without-colours make make install @@ -850,11 +857,11 @@ m4 @item gawk @item -sed +gsed @item perl @item -gnu make +gmake @end itemize Some llvm and gcc versions will not check for headers and libraries in -- 2.11.0