|
1 | 1 | #!/bin/bash |
| 2 | +ELEV="${ELEV:-"$ELEV"}" |
| 3 | + |
2 | 4 | # Strict |
3 | 5 | set -e #uo pipefail |
4 | 6 |
|
5 | | -# DO NOT RUN AS ROOT // Will prompt for sudo when needed |
6 | | -[ "$(id -u)" -eq 0 ] && echo "Error: Sudo not required." && exit 1 |
| 7 | +# DO NOT RUN AS ROOT // Will prompt when needed |
| 8 | +[ "$(id -u)" -eq 0 ] && echo "Error: Root not required." && exit 1 |
7 | 9 |
|
8 | 10 | # Build stage 1 ISO with slight modifs |
9 | 11 | # Requires 'archiso' |
@@ -39,10 +41,10 @@ cleanup() { |
39 | 41 |
|
40 | 42 | if [ -d "$WORK_DIR" ]; then |
41 | 43 | # Kill any processes using the work dir |
42 | | - sudo fuser -sk "$WORK_DIR" 2>/dev/null || true |
| 44 | + "$ELEV" fuser -sk "$WORK_DIR" 2>/dev/null || true |
43 | 45 | # Force lazy recursive unmount |
44 | | - sudo umount -lR "$WORK_DIR" 2>/dev/null || true |
45 | | - sudo rm -rf "$WORK_DIR" |
| 46 | + "$ELEV" umount -lR "$WORK_DIR" 2>/dev/null || true |
| 47 | + "$ELEV" rm -rf "$WORK_DIR" |
46 | 48 | fi |
47 | 49 | echo "Cleanup complete." |
48 | 50 | else |
@@ -140,16 +142,16 @@ mkdir -p "$WORK_DIR" |
140 | 142 |
|
141 | 143 | # Will prompt to build |
142 | 144 | if [ "$SILENT_MODE" = "1" ]; then |
143 | | - sudo taskset -c 0-$((THREADS-1)) mkarchiso -v -w "$WORK_DIR" -o "$OUTPUT_DIR" -L "$ISO_LABEL" "$PROFILE_DIR" >/dev/null 2>&1 || error_exit "mkarchiso failed" |
| 145 | + "$ELEV" taskset -c 0-$((THREADS-1)) mkarchiso -v -w "$WORK_DIR" -o "$OUTPUT_DIR" -L "$ISO_LABEL" "$PROFILE_DIR" >/dev/null 2>&1 || error_exit "mkarchiso failed" |
144 | 146 | else |
145 | | - sudo taskset -c 0-$((THREADS-1)) mkarchiso -v -w "$WORK_DIR" -o "$OUTPUT_DIR" -L "$ISO_LABEL" "$PROFILE_DIR" || error_exit "mkarchiso failed" |
| 147 | + "$ELEV" taskset -c 0-$((THREADS-1)) mkarchiso -v -w "$WORK_DIR" -o "$OUTPUT_DIR" -L "$ISO_LABEL" "$PROFILE_DIR" || error_exit "mkarchiso failed" |
146 | 148 | fi |
147 | 149 |
|
148 | 150 | echo "" |
149 | 151 | echo "✓ SUCCESS! ISO created in: $OUTPUT_DIR" |
150 | 152 | echo "Restoring permissions..." |
151 | 153 | # restores both folder and any file within to correct permissions |
152 | | -sudo chown -R "$USER":"$USER" "$OUTPUT_DIR" |
| 154 | +"$ELEV" chown -R "$USER":"$USER" "$OUTPUT_DIR" |
153 | 155 | echo "" |
154 | 156 |
|
155 | 157 | cleanup |
|
0 commit comments