summaryrefslogtreecommitdiff
path: root/tools/move.sh
blob: 57dd6ddb3e630c43b07a445244bda17373d5ef00 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
#!/usr/bin/env bash

in_array() {
	local needle=$1; shift
	local item
	for item in "$@"; do
		[[ $item = $needle ]] && return 0 # Found
	done
	return 1 # Not Found
}

split_lib() {
	local d=$1

	local t=("$d"/test-*)
	if [[ -f ${t[0]} ]]; then
		mkdir "$d/test"
		mv "$d"/test-* -t "$d/test"
	fi

	mkdir "$d/src"
	mv "$d"/*.c -t "$d/src"

	local h=${d##*/lib}
	mkdir "$d/include"
	mkdir "$d/include/$h"
	mv "$d"/*.h -t "$d/include/$h"
}

grp() {
	local grp=$1
	shift
	if [[ -d "${grp}.d" ]]; then
		mv -T "${grp}.d" "$grp"
	else
		mkdir "$grp"
	fi
	mv "$@" -t "$grp"
}

move_files() (
	# first focus on getting directories to the right names.
	mv -T src/{,systemd-}dbus1-generator
	mv -T src/{,systemd-}debug-generator
	mv -T src/{,systemd-}fstab-generator
	mv -T src/{,systemd-}getty-generator
	mv -T src/{,systemd-}gpt-auto-generator
	mv -T src/{,systemd-}rc-local-generator
	mv -T src/{,systemd-}system-update-generator
	mv -T src/{,systemd-}sysv-generator

	mv -T src/{,systemd-}ac-power
	mv -T src/{,systemd-}analyze
	mv -T src/{,systemd-}ask-password
	mv -T src/{,systemd-}backlight
	mv -T src/{,systemd-}binfmt
	mv -T src/{,systemd-}cgls
	mv -T src/{,systemd-}cgroups-agent
	mv -T src/{,systemd-}cgtop
	mv -T src/{,systemd-}cryptsetup
	mv -T src/{,systemd-}delta
	mv -T src/{,systemd-}detect-virt
	mv -T src/{,systemd-}escape
	mv -T src/{,systemd-}firstboot
	mv -T src/{,systemd-}fsck
	mv -T src/{,systemd-}hibernate-resume
	mv -T src/{,systemd-}hwdb
	mv -T src/{,systemd-}initctl
	mv -T src/{,systemd-}machine-id-setup
	mv -T src/{,systemd-}modules-load
	mv -T src/{,systemd-}notify
	mv -T src/{,systemd-}nspawn
	mv -T src/{,systemd-}path
	mv -T src/{,systemd-}quotacheck
	mv -T src/{,systemd-}random-seed
	mv -T src/{,systemd-}remount-fs
	mv -T src/{,systemd-}reply-password
	mv -T src/{,systemd-}rfkill
	mv -T src/{,systemd-}run
	mv -T src/{,systemd-}sleep
	mv -T src/{,systemd-}stdio-bridge
	mv -T src/{,systemd-}sysctl
	mv -T src/{,systemd-}sysusers
	mv -T src/{,systemd-}tmpfiles
	mv -T src/{,systemd-}tty-ask-password-agent
	mv -T src/{,systemd-}update-done
	mv -T src/{,systemd-}update-utmp
	mv -T src/{,systemd-}user-sessions
	mv -T src/vconsole     src/systemd-vconsole-setup
	mv -T src/socket-proxy src/systemd-socket-proxyd
	mv -T src/timesync     src/systemd-timesyncd
	mv -T src/activate     src/systemd-socket-activate

	mv src/udev/*_id    -t src
	mv src/udev/collect -t src

	mv -T src/boot/efi src/systemd-boot
	mv -T src/boot     src/bootctl

	mkdir src/libsystemd/src
	mv -t src/libsystemd/src src/libsystemd/sd-*
	mkdir src/libsystemd/include
	mv -T src/systemd src/libsystemd/include/systemd

	mkdir src/busctl
	mv src/libsystemd/src/sd-bus/busctl* -t src/busctl

	mkdir src/systemd
	mv -t src/systemd \
	   src/core/main* \
	   src/core/macros.systemd.in \
	   src/core/system.conf \
	   src/core/org.*

	mv -T src/{,lib}basic
	mv -T src/{,lib}core
	mv -T src/{,lib}shared

	mv -T src/lib{shared,core}/linux

	mkdir src/libfirewall
	mv -T src/lib{shared,firewall}/firewall-util.c
	mv -T src/lib{shared,firewall}/firewall-util.h

	split_lib src/libbasic
	split_lib src/libshared
	split_lib src/libsystemd-network

	mkdir src/systemd-hibernate-resume-generator
	mv -t src/systemd-hibernate-resume-generator \
	   src/systemd-hibernate-resume/*generator*

	# src/resolve => src/{libbasic-dns,resolve,resolved}
	mkdir src/libbasic-dns
	mv -t src/libbasic-dns \
	   src/resolve/dns-type.{c,h} \
	   src/resolve/resolved-dns-{answer,dnssec,packet,question,rr}.{c,h} \
	   src/resolve/test-*
	mkdir src/systemd-resolve
	mv -t src/systemd-resolve \
	   src/resolve/resolve-tool.c
	mkdir src/systemd-resolved
	mv -t src/systemd-resolved \
	   src/resolve/.gitignore \
	   src/resolve/*
	rmdir src/resolve

	# src/import => src/{libimport,systemd-{export,importd,import}}
	mkdir src/libimport
	mv -t src/libimport \
	   src/import/import-common.{c,h} \
	   src/import/import-compress.{c,h} \
	   src/import/qcow2-util.{c,h} \
	   src/import/test-qcow2.c
	mkdir src/systemd-export
	mv -t src/systemd-export \
	   src/import/export*
	mkdir src/systemd-importd
	mv -t src/systemd-importd \
	   src/import/.gitignore \
	   src/import/importd.c \
	   src/import/org.*
	mkdir src/systemd-import
	mv -t src/systemd-import \
	   src/import/import*
	mkdir src/systemd-pull
	mv -t src/systemd-pull \
	   src/import/pull* \
	   src/import/curl-util*
	rmdir src/import

	# src/journal => src/..
	mkdir src/libjournal-core
	mv -t src/libjournal-core \
	   src/journal/.gitignore \
	   src/journal/journald-* \
	   src/journal/test-*
	mkdir src/systemd-cat
	mv -t src/systemd-cat \
	   src/journal/cat.c
	mkdir src/journalctl
	mv -t src/journalctl \
	   src/journal/journal-qrcode.{c,h} \
	   src/journal/journalctl.c
	mkdir src/systemd-journald
	mv -t src/systemd-journald \
	   src/journal/journald.*
	mkdir src/libsystemd/src/sd-journal
	mv -t src/libsystemd/src/sd-journal \
	   src/journal/audit-type.c \
	   src/journal/audit-type.h \
	   src/journal/catalog.c \
	   src/journal/catalog.h \
	   src/journal/compress.c \
	   src/journal/compress.h \
	   src/journal/fsprg.c \
	   src/journal/fsprg.h \
	   src/journal/journal-authenticate.c \
	   src/journal/journal-authenticate.h \
	   src/journal/journal-def.h \
	   src/journal/journal-file.c \
	   src/journal/journal-file.h \
	   src/journal/journal-internal.h \
	   src/journal/journal-send.c \
	   src/journal/journal-vacuum.c \
	   src/journal/journal-vacuum.h \
	   src/journal/journal-verify.c \
	   src/journal/journal-verify.h \
	   src/journal/lookup3.c \
	   src/journal/lookup3.h \
	   src/journal/mmap-cache.c \
	   src/journal/mmap-cache.h \
	   src/journal/sd-journal.c
	rmdir src/journal

	# src/network => src/...
	mkdir src/systemd-networkd-wait-online
	mv -t src/systemd-networkd-wait-online \
	   src/network/networkd-wait-online*
	mkdir src/libnetworkd-core
	mv -t src/libnetworkd-core \
	   src/network/.gitignore \
	   src/network/networkd-*
	mkdir src/networkctl
	mv -t src/networkctl \
	   src/network/networkctl.c
	mkdir src/systemd-networkd
	mv -t src/systemd-networkd \
	   src/network/networkd* \
	   src/network/org.*
	mkdir src/grp-network.d
	mv -t src/grp-network.d \
	   src/network/test-*
	rmdir src/network

	# src/machine => src/{machinectl,systemd-machined}
	mkdir src/machinectl
	mv -t src/machinectl \
	   src/machine/machinectl*
	mkdir src/systemd-machined
	mv -t src/systemd-machined \
	   src/machine/.gitignore \
	   src/machine/*
	rmdir src/machine

	# src/coredump => src/{coredumpctl,systemd-coredump}
	mkdir src/coredumpctl
	mv -t src/coredumpctl \
	   src/coredump/coredumpctl*
	mkdir src/systemd-coredump
	mv -t src/systemd-coredump \
	   src/coredump/*
	rmdir src/coredump

	# src/hostname => src/{hostnamectl,systemd-hostnamed}
	mkdir src/hostnamectl
	mv -t src/hostnamectl \
	   src/hostname/hostnamectl*
	mkdir src/systemd-hostnamed
	mv -t src/systemd-hostnamed \
	   src/hostname/.gitignore \
	   src/hostname/*
	rmdir src/hostname

	# src/journal-remote => src/...
	mkdir src/systemd-journal-gatewayd
	mv -t src/systemd-journal-gatewayd \
	   src/journal-remote/journal-gateway*
	mkdir src/systemd-journal-remote
	mv -t src/systemd-journal-remote \
	   src/journal-remote/journal-remote*
	mkdir src/systemd-journal-upload
	mv -t src/systemd-journal-upload \
	   src/journal-remote/journal-upload*
	mkdir src/grp-remote.d
	mv -t src/grp-remote.d \
	   src/journal-remote/.gitignore \
	   src/journal-remote/browse.html \
	   src/journal-remote/log-generator.py \
	   src/journal-remote/microhttpd*
	rmdir src/journal-remote

	# src/locale => src/...
	mkdir src/localectl
	mv -t src/localectl \
	   src/locale/localectl*
	mkdir src/systemd-localed
	mv -t src/systemd-localed \
	   src/locale/.gitignore \
	   src/locale/*
	rmdir src/locale

	# src/login => src/...
	mkdir src/grp-login.d
	mv -t src/grp-login.d \
	   src/login/.gitignore \
	   src/login/test-*
	mkdir src/loginctl
	mv -t src/loginctl \
	   src/login/loginctl* \
	   src/login/sysfs-show*
	mkdir src/pam_systemd
	mv -t src/pam_systemd \
	   src/login/pam*
	mkdir src/systemd-inhibit
	mv -t src/systemd-inhibit \
	   src/login/inhibit*
	mkdir src/systemd-logind
	mv -t src/systemd-logind \
	   src/login/logind* \
	   src/login/*.rules \
	   src/login/*.rules.in \
	   src/login/org.*
	mv -T src/login/systemd-user.m4 src/systemd-logind/systemd-user.pam.m4
	rmdir src/login

	# src/timedate => src/...
	mkdir src/timedatectl
	mv -t src/timedatectl \
	   src/timedate/timedatectl*
	mkdir src/systemd-timedated
	mv -t src/systemd-timedated \
	   src/timedate/.gitignore \
	   src/timedate/timedated* \
	   src/timedate/org.*
	rmdir src/timedate

	# src/udev => src/...
	mv -T src/udev/udev.h src/libudev/udev.h
	mkdir src/udevadm
	mv -t src/udevadm \
	   src/udev/udevadm*
	mkdir src/libudev-core
	mv -t src/libudev-core \
	   src/udev/udev-*
	mkdir src/systemd-udevd
	mv -t src/systemd-udevd \
	   src/udev/udevd*

	# auto-distribute the stuff
	(
		mv -t src/libsystemd man/sd*
		cd man
		for file in *; do
			if [[ -d ../src/"${file%%.*}" ]]; then
				mv "$file" -t ../src/"${file%%.*}"
			elif [[ -d ../src/"${file%%@*}" ]]; then
				mv "$file" -t ../src/"${file%%@*}"
			fi
		done
	)
	(
		cd units
		for file in *; do
			if [[ -d ../src/"${file%%.*}" ]]; then
				mv "$file" -t ../src/"${file%%.*}"
			elif [[ -d ../src/"${file%%@*}" ]]; then
				mv "$file" -t ../src/"${file%%@*}"
			fi
		done
	)
	(
		cd shell-completion/bash
		for file in *; do
			if [[ -d ../../src/"$file" ]]; then
				mv -T "$file" "../../src/$file/$file.completion.bash"
			fi
		done
	)
	(
		cd shell-completion/zsh
		for file in _*; do
			if [[ -d ../../src/"${file#_}" ]]; then
				mv -T "$file" "../../src/${file#_}/${file#_}.completion.zsh"
			fi
		done
	)
	
	# categorize
	grp src/grp-boot \
	    src/bootctl \
	    src/kernel-install \
	    src/systemd-boot
	grp src/grp-coredump \
	    src/coredumpctl \
	    src/systemd-coredump
	grp src/grp-hostname \
	    src/hostnamectl \
	    src/systemd-hostnamed
	grp src/grp-initprogs \
	    src/systemd-backlight \
	    src/systemd-binfmt \
	    src/systemd-detect-virt \
	    src/systemd-firstboot \
	    src/systemd-fsck \
	    src/systemd-modules-load \
	    src/systemd-quotacheck \
	    src/systemd-random-seed \
	    src/systemd-rfkill \
	    src/systemd-sysctl \
	    src/systemd-sysusers \
	    src/systemd-tmpfiles \
	    src/systemd-update-done \
	    src/systemd-update-utmp \
	    src/systemd-user-sessions \
	    src/systemd-vconsole-setup
	grp src/grp-initprogs/grp-sleep \
	    src/systemd-hibernate-resume \
	    src/systemd-hibernate-resume-generator \
	    src/systemd-sleep
	grp src/grp-remote \
	    src/systemd-journal-gatewayd \
	    src/systemd-journal-remote \
	    src/systemd-journal-upload
	grp src/grp-journal \
	    catalog \
	    src/grp-remote \
	    src/journalctl \
	    src/libjournal-core \
	    src/systemd-cat \
	    src/systemd-journald
	grp src/grp-locale \
	    src/localectl \
	    src/systemd-localed
	grp src/grp-login \
	    src/loginctl \
	    src/pam_systemd \
	    src/systemd-inhibit \
	    src/systemd-logind
	grp src/grp-machine \
	    src/machinectl \
	    src/nss-mymachines \
	    src/systemd-machined
	grp src/grp-machine/grp-import \
	    src/libimport \
	    src/systemd-export \
	    src/systemd-import \
	    src/systemd-importd \
	    src/systemd-pull
	grp src/grp-network \
	    network \
	    src/libnetworkd-core \
	    src/networkctl \
	    src/systemd-networkd \
	    src/systemd-networkd-wait-online
	grp src/grp-resolve \
	    src/libbasic-dns \
	    src/nss-resolve \
	    src/systemd-resolve \
	    src/systemd-resolved
	grp src/grp-system \
	    src/libcore \
	    src/systemctl \
	    src/systemd
	grp src/grp-system/grp-utils \
	    src/systemd-analyze \
	    src/systemd-delta \
	    src/systemd-fstab-generator \
	    src/systemd-run \
	    src/systemd-sysv-generator
	grp src/grp-timedate \
	    src/systemd-timedated \
	    src/timedatectl
	grp src/grp-udev \
	    rules \
	    src/*_id \
	    src/systemd-hwdb \
	    src/systemd-udevd \
	    src/udevadm
	grp src/grp-utils \
	    src/systemd-ac-power \
	    src/systemd-escape \
	    src/systemd-notify \
	    src/systemd-path \
	    src/systemd-socket-activate
)

breakup_makefile() (
        touch .tmp.move.all
        files=(.tmp.move.all)
        file=/dev/null
        IFS=''
        while read -r line; do
                if [[ $line = '#@'* ]]; then
                        file="${line#'#@'}"
                        file="${file%% *}"
                elif [[ $file = all ]]; then
                        printf '%s\n' "$line" | tee -a "${files[@]}" >/dev/null
                else
			if ! in_array "$file" "${files[@]}"; then
				cat .tmp.move.all > "$file"
				files+=("$file")
			fi
                        printf '%s\n' "$line" >> "$file"
                fi
        done < <(fixup_makefile <Makefile.am)
        rm .tmp.move.all
)

fixup_includes() (
	find src \( -name '*.h' -o -name '*.c' \) \
	     -exec grep '#include ["<]sd-' -l -- {} + |
	    xargs -d $'\n' sed -ri \
		  -e 's|#include "(sd-[^"]*)"|#include <systemd/\1>|' \
		  -e 's|#include <(sd-[^>]*)>|#include <systemd/\1>|'
)

fixup_makefile() {
	sed -r \
	    -e '/^[^#	]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
	    -e 's|^if (.*)|ifneq ($(\1),)|' \
	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
}

fixup_makefiles() (
	sed -ri \
	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
	    -e 's/ \$\(CFLAGS\) / /g' \
	    -e 's/ \$\(CPPFLAGS\) / /g' \
	    -e 's/ \$\(AM_CPPFLAGS\) / $(sd.ALL_CPPFLAGS) /g' \
	    -e '/^[^#	]*:/ { s|\S+/|$(outdir)/|g }' \
	    src/libbasic/include/basic/Makefile \
	    src/libsystemd/src/Makefile \
	    src/libsystemd/src/sd-journal/Makefile \
	    src/grp-udev/libudev-core/Makefile
	find -type f -name Makefile|while read -r filename; do
		sed -r -i "s|(/\.\.)*/config.mk|/$(realpath -ms --relative-to="${filename%/*}" config.mk)|" "$filename"
	done
)

breakup_zshcompletion() (
	sed_expr='
		1 {
			i #compdef %s
			d
		}
		/^case/,/^esac/ {
			/^    %s)/,/^    ;;/ {
				s/^        //p
			}
			d
		}
	'

	cd shell-completion/zsh
	read -r _ cmds < _systemd
	for cmd in $cmds; do
		printf -v cmd_sed_expr "$sed_expr" $cmd $cmd
		sed -e "$cmd_sed_expr" < _systemd > _$cmd
	done
	rm _systemd
)

move() (
        find . \( -name Makefile -o -name '*.mk' \) -delete

	>&2 echo ' => breakup_zshcompletion'
	breakup_zshcompletion
	>&2 echo ' => move_files'
	move_files
	>&2 echo ' => breakup_makefile'
	#breakup_makefile
	>&2 echo ' => fixup_includes'
	fixup_includes
	>&2 echo ' => fixup_makefiles'
	#fixup_makefiles
)

main() {
	set -e

	if [[ -n "$(git status -s)" ]] || [[ -n "$(git clean -xdn)" ]]; then
		echo 'There are changes in the current directory.' >&2
		exit 1
	fi

	git checkout -b tmp/postmove

	move

	git add .
	git commit -m './move.sh'
	git merge -s ours notsystemd/postmove
	git checkout notsystemd/postmove
	git merge tmp/postmove
	git branch -d tmp/postmove
}

main "$@"