Skip to content

Commit c293600

Browse files
author
falkTX
committed
Dont use relative path, delete an old file
1 parent 095c499 commit c293600

File tree

2 files changed

+47
-55
lines changed

2 files changed

+47
-55
lines changed

scripts/iso-stuff-mod.7z

-1.42 MB
Binary file not shown.

scripts/kxstudio-create-iso

Lines changed: 47 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ fi
4242
case $1 in
4343

4444
squash)
45-
sudo debootstrap --arch=$3 $2 ~/livecd/custom http://archive.ubuntu.com/ubuntu/
45+
sudo debootstrap --arch=$3 $2 /home/falktx/livecd/custom http://archive.ubuntu.com/ubuntu/
4646
exit
4747
;;
4848

4949
custom)
50-
# sudo mount --bind /dev ~/livecd/custom/dev
51-
sudo rm -f ~/livecd/custom/etc/hosts
52-
sudo rm -f ~/livecd/custom/etc/resolv.conf
53-
sudo cp /etc/resolv.conf /etc/hosts ~/livecd/custom/etc/
50+
# sudo mount --bind /dev /home/falktx/livecd/custom/dev
51+
sudo rm -f /home/falktx/livecd/custom/etc/hosts
52+
sudo rm -f /home/falktx/livecd/custom/etc/resolv.conf
53+
sudo cp /etc/resolv.conf /etc/hosts /home/falktx/livecd/custom/etc/
5454
echo "run this now:
5555
5656
mount -t proc none /proc/
@@ -98,11 +98,11 @@ deb [arch=amd64] http://archive.neon.kde.org/user/lts/ xenial main
9898
# deb-src http://archive.neon.kde.org/user/lts/ xenial main
9999
100100
# Stuff to delete later on
101-
deb http://archive.neon.kde.org/dev/unstable/ bionic main
102-
# deb-src http://archive.neon.kde.org/dev/unstable/ bionic main
103-
deb http://archive.ubuntu.com/ubuntu/ artful main restricted universe multiverse
104-
deb http://archive.ubuntu.com/ubuntu/ artful-updates main restricted universe multiverse
105-
deb http://security.ubuntu.com/ubuntu/ artful-security main restricted universe multiverse
101+
deb http://archive.neon.kde.org/dev/stable/ bionic main
102+
# deb-src http://archive.neon.kde.org/dev/stable/ bionic main
103+
deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse
104+
deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe multiverse
105+
deb http://security.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
106106
' > /etc/apt/sources.list
107107
108108
# Update System
@@ -147,13 +147,8 @@ apt-get install indicator-cpufreq \
147147
# Remove deprecated/dummy
148148
apt-get purge kxstudio-meta-live-conflicts
149149
apt-get install calf-plugins-git zynaddsubfx-git
150-
apt-get purge ardour3
151-
apt-get purge amsynth-dssi drumkv1 samplv1 synthv1
152-
apt-get purge carla calf-plugins
153-
apt-get purge composite composite-data
150+
apt-get purge carla calf-plugins ardour3 amsynth-dssi drumkv1 samplv1 synthv1 composite composite-data flashplugin-installer
154151
apt-get purge hydrogen-drumkits hydrogen-drumkits-effects fluid-soundfont-gm
155-
apt-get purge kxstudio-kernel-lowlatency
156-
apt-get purge flashplugin-installer
157152
158153
# Cleanup
159154
apt-get autoremove
@@ -164,15 +159,15 @@ rm /boot/*liquorix*
164159
165160
## ---- PAUSE HERE ----- ##
166161
# Before installing ubiquity in the live session, you'll need to run this outside:
167-
$ sudo mkdir -p ~/livecd/cd/casper/
168-
$ sudo touch ~/livecd/cd/casper/filesystem.manifest-desktop
169-
$ sudo chmod 777 ~/livecd/cd/casper/filesystem.manifest-desktop
170-
$ sudo chroot ~/livecd/custom dpkg-query -W --showformat='\${Package} \${Version}\n' > ~/livecd/cd/casper/filesystem.manifest-desktop"
162+
$ sudo mkdir -p /home/falktx/livecd/cd/casper/
163+
$ sudo touch /home/falktx/livecd/cd/casper/filesystem.manifest-desktop
164+
$ sudo chmod 777 /home/falktx/livecd/cd/casper/filesystem.manifest-desktop
165+
$ sudo chroot /home/falktx/livecd/custom dpkg-query -W --showformat='\${Package} \${Version}\n' > /home/falktx/livecd/cd/casper/filesystem.manifest-desktop"
171166

172-
# sudo mkdir -p ~/livecd/cd/casper/
173-
# sudo touch ~/livecd/cd/casper/filesystem.manifest-desktop
174-
# sudo chmod 777 ~/livecd/cd/casper/filesystem.manifest-desktop
175-
# sudo chroot ~/livecd/custom dpkg-query -W --showformat='${Package} ${Version}\n' > ~/livecd/cd/casper/filesystem.manifest-desktop
167+
# sudo mkdir -p /home/falktx/livecd/cd/casper/
168+
# sudo touch /home/falktx/livecd/cd/casper/filesystem.manifest-desktop
169+
# sudo chmod 777 /home/falktx/livecd/cd/casper/filesystem.manifest-desktop
170+
# sudo chroot /home/falktx/livecd/custom dpkg-query -W --showformat='${Package} ${Version}\n' > /home/falktx/livecd/cd/casper/filesystem.manifest-desktop
176171

177172
echo "## ----- END PAUSE ----- ##
178173
@@ -193,17 +188,14 @@ apt-get purge \
193188
ubiquity-ubuntu-artwork user-setup xfsprogs
194189
195190
"
196-
sudo chroot ~/livecd/custom
191+
sudo chroot /home/falktx/livecd/custom
197192
echo "done"
198193
exit
199194
;;
200195

201196
custom_end)
202197
echo "run this now:
203198
204-
#rm -f /sbin/initctl
205-
#dpkg-divert --rename --remove /sbin/initctl
206-
207199
rm -f /var/kxstudio/*
208200
209201
apt-get clean
@@ -216,32 +208,32 @@ umount /dev/pts
216208
umount -lf /proc
217209
umount -lf /sys
218210
exit
219-
sudo nano ~/livecd/custom/root/.bash_history
211+
sudo nano /home/falktx/livecd/custom/root/.bash_history
220212
"
221213
exit
222214
;;
223215

224216
mksquash)
225-
sudo mkdir -p ~/livecd/cd/casper/
226-
cd ~/livecd/cd/casper/
227-
sudo su root -c "printf $(sudo du -sx --block-size=1 ~/livecd/custom | cut -f1) > ./filesystem.size"
217+
sudo mkdir -p /home/falktx/livecd/cd/casper/
218+
cd /home/falktx/livecd/cd/casper/
219+
sudo su root -c "printf $(sudo du -sx --block-size=1 /home/falktx/livecd/custom | cut -f1) > ./filesystem.size"
228220
sudo touch ./filesystem.manifest
229221
sudo touch ./filesystem.manifest-remove
230222
sudo chmod 777 ./filesystem.manifest
231223
sudo chmod 777 ./filesystem.manifest-remove
232-
sudo chroot ~/livecd/custom dpkg-query -W --showformat='${Package} ${Version}\n' > ./filesystem.manifest
224+
sudo chroot /home/falktx/livecd/custom dpkg-query -W --showformat='${Package} ${Version}\n' > ./filesystem.manifest
233225
if [ -f ./filesystem.manifest-desktop ]; then
234226
comm -3 <(cat ./filesystem.manifest | awk '{print $1}' | sort) <(cat ./filesystem.manifest-desktop | awk '{print $1}' | sort) > ./filesystem.manifest-remove
235227
fi
236228
sudo rm -f ./filesystem.squashfs ./filesystem.manifest-desktop
237-
sudo mksquashfs ~/livecd/custom ./filesystem.squashfs -noappend -comp xz
229+
sudo mksquashfs /home/falktx/livecd/custom ./filesystem.squashfs -noappend -comp xz
238230
echo "done"
239231
exit
240232
;;
241233

242234
mkart)
243-
if [ ! -f ~/livecd/iso-stuff.7z ]; then
244-
echo "Please copy iso-stuff.7z to ~/livecd before continuing"
235+
if [ ! -f /home/falktx/livecd/iso-stuff.7z ]; then
236+
echo "Please copy iso-stuff.7z to /home/falktx/livecd before continuing"
245237
exit
246238
fi
247239

@@ -258,14 +250,14 @@ echo "usage: $0 mkart $ISO_ARCH <distro>"
258250
exit
259251
fi
260252

261-
sudo mkdir -p ~/livecd/cd
262-
cd ~/livecd/cd
253+
sudo mkdir -p /home/falktx/livecd/cd
254+
cd /home/falktx/livecd/cd
263255
sudo 7z x -y ../iso-stuff.7z
264256

265-
sudo sed "s/X-ISO_ARCH-X/$ISO_ARCH/" -i ~/livecd/cd/README.diskdefines
266-
sudo sed "s/X-ISO_NAME-X/$ISO_NAME/" -i ~/livecd/cd/README.diskdefines
267-
sudo sed "s/X-ISO_NAME-X/$ISO_NAME/" -i ~/livecd/cd/isolinux/txt.cfg
268-
sudo mkdir -p ~/livecd/cd/.disk/
257+
sudo sed "s/X-ISO_ARCH-X/$ISO_ARCH/" -i /home/falktx/livecd/cd/README.diskdefines
258+
sudo sed "s/X-ISO_NAME-X/$ISO_NAME/" -i /home/falktx/livecd/cd/README.diskdefines
259+
sudo sed "s/X-ISO_NAME-X/$ISO_NAME/" -i /home/falktx/livecd/cd/isolinux/txt.cfg
260+
sudo mkdir -p /home/falktx/livecd/cd/.disk/
269261

270262
if [ "$ISO_ARCH" == "i386" ]; then
271263
sudo su root -c 'echo "KXStudio 14.04.5 (Live 32bit)" > .disk/info'
@@ -277,24 +269,24 @@ fi
277269
sudo su root -c 'echo "http://kxstudio.sourceforge.net/Documentation:KXStudio14045:ReleaseNotes" > .disk/release_notes_url'
278270

279271
echo "Please edit these files manually:
280-
~/livecd/cd/.disk/info
281-
~/livecd/cd/.disk/release_notes_url
282-
~/livecd/cd/README.diskdefines
283-
~/livecd/cd/isolinux/txt.cfg
284-
~/livecd/cd/preseed/live.seed
272+
/home/falktx/livecd/cd/.disk/info
273+
/home/falktx/livecd/cd/.disk/release_notes_url
274+
/home/falktx/livecd/cd/README.diskdefines
275+
/home/falktx/livecd/cd/isolinux/txt.cfg
276+
/home/falktx/livecd/cd/preseed/live.seed
285277
"
286278
exit
287279
;;
288280

289281
mkboot)
290-
sudo mkdir -p ~/livecd/cd/casper/
291-
cd ~/livecd/
282+
sudo mkdir -p /home/falktx/livecd/cd/casper/
283+
cd /home/falktx/livecd/
292284
sudo rm -f cd/casper/vmlinuz cd/casper/vmlinuz.efi cd/casper/initrd.lz cd/casper/initrd_tmp.gz
293285
sudo cp custom/boot/vmlinuz-* cd/casper/vmlinuz
294286
sudo cp custom/boot/vmlinuz-* cd/casper/vmlinuz.efi
295287
sudo cp custom/boot/initrd.img-* cd/casper/initrd_tmp.gz
296288

297-
cd ~/livecd/cd/casper
289+
cd /home/falktx/livecd/cd/casper
298290
sudo rm -rf ext
299291
sudo mkdir ext
300292
cd ext
@@ -326,7 +318,7 @@ exit
326318
;;
327319

328320
md5sum)
329-
cd ~/livecd/cd
321+
cd /home/falktx/livecd/cd
330322
sudo chmod 777 -R .
331323
sudo rm -f md5sum.txt MD5SUMS
332324
sudo su root -c "find . -type f -print0 | xargs -0 md5sum > ../md5sum.txt"
@@ -347,14 +339,14 @@ echo "usage: $0 iso <filename> <name>"
347339
exit
348340
fi
349341

350-
cd ~/livecd/cd
342+
cd /home/falktx/livecd/cd
351343

352344
# i386 ends on -boot-info-table
353345

354346
sudo xorriso -as mkisofs \
355347
-r \
356348
-V "$ARG3" \
357-
-o ~/livecd/"$ARG2".iso \
349+
-o /home/falktx/livecd/"$ARG2".iso \
358350
-J \
359351
-isohybrid-mbr isolinux/isohdpfx.bin \
360352
-partition_offset 16 \
@@ -378,9 +370,9 @@ exit
378370

379371
clean)
380372
sudo umount /tmp/livecd/
381-
sudo umount ~/livecd/squashfs/
373+
sudo umount /home/falktx/livecd/squashfs/
382374
sudo rm -rf /tmp/livecd/
383-
sudo rm -rf ~/livecd/
375+
sudo rm -rf /home/falktx/livecd/
384376
echo "done"
385377
exit
386378
;;

0 commit comments

Comments
 (0)