From 6b486b6332f2711ffe6bab72848dc6f6f85bca45 Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Wed, 4 Sep 2019 19:20:19 -0700 Subject: [PATCH] rename python scripts to barenames where possible --- bootstrap/Makefile | 2 +- bootstrap/{bootstrap.py => bootstrap} | 0 graphics/text/Makefile | 20 +++++++++---------- .../{create_caption.py => create_caption} | 0 graphics/text/{rotate.py => rotate} | 2 +- graphics/text/tint.py | 2 +- lumps/colormap/Makefile | 4 ++-- lumps/colormap/{colormap.py => colormap} | 0 lumps/playpal/Makefile | 4 ++-- lumps/playpal/{playpal.py => playpal} | 0 10 files changed, 17 insertions(+), 17 deletions(-) rename bootstrap/{bootstrap.py => bootstrap} (100%) rename graphics/text/{create_caption.py => create_caption} (100%) rename graphics/text/{rotate.py => rotate} (96%) rename lumps/colormap/{colormap.py => colormap} (100%) rename lumps/playpal/{playpal.py => playpal} (100%) diff --git a/bootstrap/Makefile b/bootstrap/Makefile index 31d927cf..3ea648c9 100644 --- a/bootstrap/Makefile +++ b/bootstrap/Makefile @@ -3,7 +3,7 @@ IWAD=./doom2.wad $(IWAD): ../lumps/playpal/playpal-base.lmp - ./bootstrap.py < $< > $@ + ./bootstrap < $< > $@ clean: $(RM) $(IWAD) diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap similarity index 100% rename from bootstrap/bootstrap.py rename to bootstrap/bootstrap diff --git a/graphics/text/Makefile b/graphics/text/Makefile index 79dc7fb3..0f7e2828 100644 --- a/graphics/text/Makefile +++ b/graphics/text/Makefile @@ -56,16 +56,16 @@ all: text_strings help.png credit.png wikilrs.png wivctms.png titlepic # Generate the menu and level strings text_strings: config.py fontchars ../../lumps/dehacked/dehacked.txt - python textgen + ./textgen cp $(TEXTGEN_GRAPHIC_LUMPS) ../ # Background for the help screen is a color shifted version of INTERPIC: helpbg.png: ../interpic.png - python tint.py ../interpic.png '#57b9b0' helpbg.png + ./tint.py ../interpic.png '#57b9b0' helpbg.png # Generate transparent image containing text for the HELP screen: help.png: text_strings helpbg.png - python smtextgen help.png 320x200 \ + ./smtextgen help.png 320x200 \ -background "helpbg.png" \ 150,5 "file:helpttl.png" \ 10,25 "Weapons" \ @@ -123,37 +123,37 @@ help.png: text_strings helpbg.png credit.png: text_strings helpbg.png credit.txt - python smtextgen credit.png 320x200 \ + ./smtextgen credit.png 320x200 \ -background "helpbg.png" \ 120,5 "file:freettl.png" \ 10,30 "include:credit.txt" cp $@ ../ wikilrs_horiz.png: - python smtextgen $@ 49x7 \ + ./smtextgen $@ 49x7 \ 0,0 killers wikilrs.png: wikilrs_horiz.png - python rotate.py wikilrs_horiz.png 270 $@ + ./rotate wikilrs_horiz.png 270 $@ cp $@ ../ wivctms.png: - python smtextgen $@ 54x7 \ + ./smtextgen $@ 54x7 \ 0,0 victims cp $@ ../ titlepic: fd1title.png fd2title.png fdmtitle.png fd1title.png: text_strings ../titlepic/titlepic.png ../m_doom.png - python create_caption.py ../titlepic/titlepic.png ../m_doom.png ../t_phase1.png $@ + ./create_caption ../titlepic/titlepic.png ../m_doom.png ../t_phase1.png $@ cp $@ ../ fd2title.png: text_strings ../titlepic/titlepic.png ../m_doom.png - python create_caption.py ../titlepic/titlepic.png ../m_doom.png ../t_phase2.png $@ + ./create_caption ../titlepic/titlepic.png ../m_doom.png ../t_phase2.png $@ cp $@ ../ fdmtitle.png: ../titlepic/freedm_titlepic.png - python create_caption.py $< $@ + ./create_caption $< $@ cp $@ ../ clean: diff --git a/graphics/text/create_caption.py b/graphics/text/create_caption similarity index 100% rename from graphics/text/create_caption.py rename to graphics/text/create_caption diff --git a/graphics/text/rotate.py b/graphics/text/rotate similarity index 96% rename from graphics/text/rotate.py rename to graphics/text/rotate index deb80874..2b890bc5 100755 --- a/graphics/text/rotate.py +++ b/graphics/text/rotate @@ -1,4 +1,4 @@ -#/usr/bin/env python +#!/usr/bin/env python # SPDX-License-Identifier: BSD-3-Clause diff --git a/graphics/text/tint.py b/graphics/text/tint.py index 5e940687..72dec66e 100755 --- a/graphics/text/tint.py +++ b/graphics/text/tint.py @@ -1,4 +1,4 @@ -#/usr/bin/env python +#!/usr/bin/env python # SPDX-License-Identifier: MIT # Copyright (c) 2017 Martin Miller, Nick Zatkovich diff --git a/lumps/colormap/Makefile b/lumps/colormap/Makefile index c80bfbf5..fd6ff7d9 100644 --- a/lumps/colormap/Makefile +++ b/lumps/colormap/Makefile @@ -5,8 +5,8 @@ COLORMAPS = colormap.lmp all: $(COLORMAPS) cp $(COLORMAPS) ../ -colormap.lmp: $(PLAYPAL) colormap.py - ./colormap.py $(PLAYPAL) > colormap.lmp +colormap.lmp: $(PLAYPAL) colormap + ./colormap $(PLAYPAL) > colormap.lmp clean: $(RM) $(COLORMAPS) ../$(COLORMAPS) diff --git a/lumps/colormap/colormap.py b/lumps/colormap/colormap similarity index 100% rename from lumps/colormap/colormap.py rename to lumps/colormap/colormap diff --git a/lumps/playpal/Makefile b/lumps/playpal/Makefile index 70cf3d79..b296de4c 100644 --- a/lumps/playpal/Makefile +++ b/lumps/playpal/Makefile @@ -1,5 +1,5 @@ -playpal.lmp: playpal-base.lmp playpal.py - ./playpal.py playpal-base.lmp > playpal.lmp +playpal.lmp: playpal-base.lmp playpal + ./playpal playpal-base.lmp > playpal.lmp cp playpal.lmp ../ clean: diff --git a/lumps/playpal/playpal.py b/lumps/playpal/playpal similarity index 100% rename from lumps/playpal/playpal.py rename to lumps/playpal/playpal