From 7c7a1be971f2769f28070e858a35bd87ad242e53 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 30 Sep 2013 22:31:28 +0200 Subject: cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 12 +++--------- got-cmd | 25 ------------------------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100755 got-cmd diff --git a/Makefile b/Makefile index b254be6..6429897 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ info/%.texinfo.install: info/%.texinfo sed -i 's:^@set SSH ssh:@set SSH $(SSH):g' "$@" .PHONY: cmd -cmd: got.install got-cmd.install +cmd: got.install got.install: got cp "$<" "$@" @@ -49,10 +49,6 @@ got.install: got sed -i 's:@command@:$(COMMAND):g' "$@" sed -i 's:@ssh@:$(SSH):g' "$@" -got-cmd.install: got-cmd - cp "$<" "$@" - sed -i 's:#!/usr/bin/env bash:#!$(BASH_SHEBANG):g' "$@" - .PHONY: install @@ -62,9 +58,8 @@ install: install-cmd install-doc install-cmd: install-core install-examples .PHONY: install-core -install-core: got.install got-cmd.install +install-core: got.install install -Dm755 -- "got.install" "$(DESTDIR)$(PREFIX)$(SBIN)/got" - install -Dm755 -- "got-cmd.install" "$(DESTDIR)$(PREFIX)$(BIN)/got-cmd" install -d -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)" install -m644 -- COPYING LICENSE "$(DESTDIR)$(LICENSES)/$(PKGNAME)" @@ -85,8 +80,7 @@ install-info: gates-of-tartaros.info.gz .PHONY: uninstall uninstall: -rm -- "$(DESTDIR)$(PREFIX)$(SBIN)/got" - -rm -- "$(DESTDIR)$(PREFIX)$(BIN)/got-cmd" - -rm -- "$(DESTDIR)$(SYSCONF)/gotrc.examples/lower-left-ponysay" + -rm -r -- "$(DESTDIR)$(SYSCONF)/gotrc.examples" -rm -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/COPYING" -rm -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/LICENSE" -rm -d -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)" diff --git a/got-cmd b/got-cmd deleted file mode 100755 index 9c0ded3..0000000 --- a/got-cmd +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# gates-of-tartaros – Minimal replacement for agetty with SSH support -# -# Copyright © 2013 Mattias Andrée (maandree@member.fsf.org) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - - -cmd="${GOT_COMMAND}" -unset GOT_COMMAND -$cmd - -- cgit v1.2.3-70-g09d2