# HG changeset patch # User Pascal Bellard # Date 1438589485 -7200 # Node ID 506184fa11056e22d65f853e27b043efa2cee9ba # Parent d7b7403d5f2a939c9c232317d17e90a7285115ad tazpanel: typos diff -r d7b7403d5f2a -r 506184fa1105 Makefile --- a/Makefile Sun Aug 02 20:24:23 2015 +0200 +++ b/Makefile Mon Aug 03 10:11:25 2015 +0200 @@ -6,7 +6,7 @@ LINGUAS?=el es fr pl pt_BR ru sv PANEL?=/var/www/tazpanel BASECGI?=boot.cgi hardware.cgi help.cgi index.cgi network.cgi settings.cgi -EXTRACGI?=floppy.cgi powersaveing.cgi +EXTRACGI?=floppy.cgi powersaving.cgi VERSION:=$(shell grep ^VERSION tazpanel | cut -d '=' -f 2) @@ -50,7 +50,7 @@ -[ "$(VERSION)" ] && sed -i 's/^VERSION=[0-9].*/VERSION=$(VERSION)/' $(DESTDIR)$(PREFIX)/bin/tazpanel cp -a lib/ styles/ doc/ README* $(DESTDIR)$(PANEL) @for c in $(BASECGI); do \ - cp -a $$l $(DESTDIR)$(PANEL); \ + cp -a $$c $(DESTDIR)$(PANEL); \ done; if [ -e $(DESTDIR)$(PANEL)/user ] ; then rm -rf $(DESTDIR)$(PANEL)/user; fi ln -s . $(DESTDIR)$(PANEL)/user @@ -70,13 +70,14 @@ install_extra: mkdir -p \ $(DESTDIR)$(PANEL)/menu.d/boot \ - $(DESTDIR)$(PANEL)/menu.d/hardware + $(DESTDIR)$(PANEL)/menu.d/hardware \ + $(DESTDIR)/usr/bin @for c in $(EXTRACGI); do \ - cp -a $$l $(DESTDIR)$(PANEL); \ + cp -a $$c $(DESTDIR)$(PANEL); \ done; cp -a bootloader $(DESTDIR)/usr/bin - ln -s ../../floppy.cgi $(DESTDIR)/menu.d/boot/floppy - ln -s ../../powersaving.cgi $(DESTDIR)/menu.d/hardware/powersaving + ln -s ../../floppy.cgi $(DESTDIR)$(PANEL)/menu.d/boot/floppy + ln -s ../../powersaving.cgi $(DESTDIR)$(PANEL)/menu.d/hardware/powersaving # Clean source diff -r d7b7403d5f2a -r 506184fa1105 bootloader --- a/bootloader Sun Aug 02 20:24:23 2015 +0200 +++ b/bootloader Mon Aug 03 10:11:25 2015 +0200 @@ -330,7 +330,7 @@ [ $syssz -gt 32768 ] && syssz=$(get 0x1F4 $bs 2) [ $syssz -eq 0 ] && syssz=$((0x7F00)) sysszsect=$((($syssz+31)/32)) - INITRD="${INITRD%%,*}" + INITRD="${INITRD%% *}" initrdlen=$(stat -c %s "$INITRD") store 16 $OldRamfsLenOfs $(($initrdlen/1024)) $bs set oldramfs INITRDDISKALIGN=$((0x40000))