From 71e35ef5f55265f8650c829b561dda961813e363 Mon Sep 17 00:00:00 2001 From: Balakrishnan Balasubramanian Date: Wed, 6 Aug 2025 12:57:36 -0400 Subject: [PATCH] root may or maynot be a symlink --- Makefile | 6 +++--- README.md | 4 ++-- install.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5a6aeb0..540937e 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ tmpfiles: ## Run this after editing files under tmpfiles.d .PHONY: save-perms save-perms: ## Saves the file permissions to ./acl. Run this after adding new files with correct permissions - getfacl --recursive `readlink root` | ./makepac/sort_acl.sh > acl + getfacl --recursive $(shell basename $(shell readlink -f root)) | ./makepac/sort_acl.sh > acl .PHONY: set-perms set-perms: ## Restores permissions of all files from ./acl @@ -35,8 +35,8 @@ set-perms: ## Restores permissions of all files from ./acl .PHONY: user-perms user-perms: ## Grant running user all permissions. Need for git operations. Does not get copied to real filesystem - find `readlink root` -type d | xargs sudo setfacl -m "u:${USER}:rwx" - find `readlink root` -type f | xargs sudo setfacl -m "u:${USER}:r" + find $(shell basename $(shell readlink -f root)) -type d | xargs sudo setfacl -m "u:${USER}:rwx" + find $(shell basename $(shell readlink -f root)) -type f | xargs sudo setfacl -m "u:${USER}:r" .PHONY: skel skel: ## Creates common directories needed diff --git a/README.md b/README.md index 612af78..a7a0ca4 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ Initial setup mkdir myfiles cd myfiles git init - git submodule add https://gitlab.com/balki/makepac' - echo "include makepac/Makefile" > Makefile' + git submodule add https://gitlab.com/balki/makepac + echo "include makepac/Makefile" > Makefile sudo apt install acl make skel git add . diff --git a/install.sh b/install.sh index ebaaa46..bc36dbf 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash -root=$(readlink root) +root=$(basename $(readlink -f root)) all_files() { find "$root" -type f,l