summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Jackson <barjac@mageia.org>2016-09-17 12:53:14 +0100
committerBarry Jackson <barjac@mageia.org>2016-09-17 12:53:14 +0100
commit76d89e95603d515eaa20c3a49b27d0d7a404b53e (patch)
treed68f9ac70f2b2219120d638bff9e3f91e4623865
parent564aad585d86c781ece34afb8c92d5af12065a11 (diff)
downloadtheme-76d89e95603d515eaa20c3a49b27d0d7a404b53e.tar
theme-76d89e95603d515eaa20c3a49b27d0d7a404b53e.tar.gz
theme-76d89e95603d515eaa20c3a49b27d0d7a404b53e.tar.bz2
theme-76d89e95603d515eaa20c3a49b27d0d7a404b53e.tar.xz
theme-76d89e95603d515eaa20c3a49b27d0d7a404b53e.zip
- remove default.jpg symlink (now in mageia-theme spec
- remove commented code from Makefile
-rw-r--r--Makefile6
-rwxr-xr-xmga-bg-res/mga-bg-res.sh1
2 files changed, 1 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index f5548e2..c3ff392 100644
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,11 @@ scripts:
@for i in */gfxboot/*.png ; do \
echo \(gimp-normalize-to-bootsplash 1.0 \"$$i\" \"`dirname $$i`/`basename $$i .png`.jpg\"\) >> tmp-gimp-command; \
done
-# @for i in */background/*.png ; do \
-# echo \(gimp-convert-to-jpeg 0.98 \"$$i\" \"`dirname $$i`/`basename $$i .png`.jpg\"\) >> tmp-gimp-command; \
-# done
+
@echo \(gimp-quit 1\) >> tmp-gimp-command
@echo running gimp to convert images
@cat tmp-gimp-command | gimp --console-messages -i -d -b -
@rm -f tmp-gimp-command
-# GIMP2_DIRECTORY=`pwd`/gimp gimp --console-messages -i -d -b '(begin (gimp-normalize-to-bootsplash-dirs "1.0" "*" "bootsplash/data/*.png") (gimp-quit 1))'
-# GIMP2_DIRECTORY=`pwd`/gimp gimp --console-messages -i -d -b '(begin (gimp-normalize-to-bootsplash-dirs "1.0" "*" "gfxboot/*.png") (gimp-quit 1))'
install:
mkdir -p $(DESTDIR)$(sharedir)/mga/screensaver
diff --git a/mga-bg-res/mga-bg-res.sh b/mga-bg-res/mga-bg-res.sh
index b6b0f24..79c0e68 100755
--- a/mga-bg-res/mga-bg-res.sh
+++ b/mga-bg-res/mga-bg-res.sh
@@ -41,7 +41,6 @@ fi
if [ "$curlink" != "$bgpath/$theme-$res.png" ]; then
if [ -e "$bgpath/$theme-$res.png" ]; then
ln -sf $bgpath/$theme-$res.png $bgpath/default.png
- ln -sf $bgpath/default.png $bgpath/default.jpg
if [ -d /boot/grub2/themes ]; then
cp -f $bgpath/$theme-$res.png /boot/grub2/themes/grub2-mageia-default.png
fi