tazpanel rev 517

tazpanel: typos
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Aug 03 10:11:25 2015 +0200 (2015-08-03)
parents d7b7403d5f2a
children e2a7569a50d8
files Makefile bootloader
line diff
     1.1 --- a/Makefile	Sun Aug 02 20:24:23 2015 +0200
     1.2 +++ b/Makefile	Mon Aug 03 10:11:25 2015 +0200
     1.3 @@ -6,7 +6,7 @@
     1.4  LINGUAS?=el es fr pl pt_BR ru sv
     1.5  PANEL?=/var/www/tazpanel
     1.6  BASECGI?=boot.cgi hardware.cgi help.cgi index.cgi network.cgi settings.cgi
     1.7 -EXTRACGI?=floppy.cgi powersaveing.cgi
     1.8 +EXTRACGI?=floppy.cgi powersaving.cgi
     1.9  
    1.10  VERSION:=$(shell grep ^VERSION tazpanel | cut -d '=' -f 2)
    1.11  
    1.12 @@ -50,7 +50,7 @@
    1.13  	-[ "$(VERSION)" ] && sed -i 's/^VERSION=[0-9].*/VERSION=$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/tazpanel
    1.14  	cp -a lib/ styles/ doc/ README* $(DESTDIR)$(PANEL)
    1.15  	@for c in $(BASECGI); do \
    1.16 -		cp -a $$l $(DESTDIR)$(PANEL); \
    1.17 +		cp -a $$c $(DESTDIR)$(PANEL); \
    1.18  	done;
    1.19  	if [ -e $(DESTDIR)$(PANEL)/user ] ; then rm -rf $(DESTDIR)$(PANEL)/user; fi
    1.20  	ln -s . $(DESTDIR)$(PANEL)/user
    1.21 @@ -70,13 +70,14 @@
    1.22  install_extra:
    1.23  	mkdir -p \
    1.24  		$(DESTDIR)$(PANEL)/menu.d/boot \
    1.25 -		$(DESTDIR)$(PANEL)/menu.d/hardware
    1.26 +		$(DESTDIR)$(PANEL)/menu.d/hardware \
    1.27 +		$(DESTDIR)/usr/bin
    1.28  	@for c in $(EXTRACGI); do \
    1.29 -		cp -a $$l $(DESTDIR)$(PANEL); \
    1.30 +		cp -a $$c $(DESTDIR)$(PANEL); \
    1.31  	done;
    1.32  	cp -a bootloader $(DESTDIR)/usr/bin
    1.33 -	ln -s ../../floppy.cgi $(DESTDIR)/menu.d/boot/floppy
    1.34 -	ln -s ../../powersaving.cgi $(DESTDIR)/menu.d/hardware/powersaving
    1.35 +	ln -s ../../floppy.cgi $(DESTDIR)$(PANEL)/menu.d/boot/floppy
    1.36 +	ln -s ../../powersaving.cgi $(DESTDIR)$(PANEL)/menu.d/hardware/powersaving
    1.37  
    1.38  # Clean source
    1.39  
     2.1 --- a/bootloader	Sun Aug 02 20:24:23 2015 +0200
     2.2 +++ b/bootloader	Mon Aug 03 10:11:25 2015 +0200
     2.3 @@ -330,7 +330,7 @@
     2.4  		[ $syssz -gt 32768 ] && syssz=$(get 0x1F4 $bs 2)
     2.5  		[ $syssz -eq 0 ] && syssz=$((0x7F00))
     2.6  		sysszsect=$((($syssz+31)/32))
     2.7 -		INITRD="${INITRD%%,*}"
     2.8 +		INITRD="${INITRD%% *}"
     2.9  		initrdlen=$(stat -c %s "$INITRD")
    2.10  		store 16 $OldRamfsLenOfs $(($initrdlen/1024)) $bs set oldramfs
    2.11  		INITRDDISKALIGN=$((0x40000))