Browse Source

remove defaults from scripts to /etc/pyfll/defaults.conf

Alf Gaida 2 years ago
parent
commit
859c293d6f
19 changed files with 85 additions and 85 deletions
  1. 4
    5
      buildiso
  2. 10
    0
      current-lxde
  3. 4
    5
      current-nox
  4. 4
    5
      current-xorg
  5. 4
    5
      next-gnome
  6. 4
    5
      next-kde
  7. 4
    5
      next-lxqt
  8. 4
    5
      next-mate
  9. 4
    5
      next-xfce
  10. 7
    0
      pyfll/defaults.conf.sample
  11. 4
    5
      xperimental-cinnamon
  12. 4
    5
      xperimental-gnome
  13. 4
    5
      xperimental-kde
  14. 4
    5
      xperimental-lxde
  15. 4
    5
      xperimental-lxqt
  16. 4
    5
      xperimental-mate
  17. 4
    5
      xperimental-nox
  18. 4
    5
      xperimental-xfce
  19. 4
    5
      xperimental-xorg

+ 4
- 5
buildiso View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-v" 
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=nox
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 10
- 0
current-lxde View File

@@ -0,0 +1,10 @@
1
+#!/bin/bash
2
+
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6
+flavour=xorg
7
+release=current
8
+arch=amd64
9
+
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
current-nox View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vP "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=nox
7 7
 release=current
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
current-xorg View File

@@ -1,10 +1,9 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=xorg
7 7
 release=current
8
-arch=amd64
9 8
 
10
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
9
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
next-gnome View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=gnome
7 7
 release=next
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
next-kde View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-v " 
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=kde
7 7
 release=next
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
next-lxqt View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=lxqt
7 7
 release=next
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
next-mate View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=mate
7 7
 release=next
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
next-xfce View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=xfce
7 7
 release=next
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 7
- 0
pyfll/defaults.conf.sample View File

@@ -0,0 +1,7 @@
1
+## defaults
2
+options="-vv "
3
+confpath="./pyfll/conf/"
4
+flavour=lxqt
5
+release=xperimental
6
+arch=amd64
7
+aptcache="-t http://192.168.150.41:3142"

+ 4
- 5
xperimental-cinnamon View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vvvvv -P"
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=cinnamon
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
xperimental-gnome View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vvvvv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=gnome
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
xperimental-kde View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-v " 
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=kde
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
xperimental-lxde View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=lxde
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
xperimental-lxqt View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=lxqt
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
xperimental-mate View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=mate
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
xperimental-nox View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vvv -P "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=nox
7 7
 release=xperimental
8 8
 arch=amd64
9
-#aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
xperimental-xfce View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=xfce
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

+ 4
- 5
xperimental-xorg View File

@@ -1,11 +1,10 @@
1 1
 #!/bin/bash
2 2
 
3
-## defaults
4
-options="-vv "
5
-confpath="./pyfll/conf/"
3
+# one will find a sample defaults.conf in ./pyfll
4
+[ -e /etc/pyfll/defaults.conf ] && source /etc/pyfll/defaults.conf
5
+
6 6
 flavour=xorg
7 7
 release=xperimental
8 8
 arch=amd64
9
-aptcache="-t http://192.168.150.41:3142"
10 9
 
11
-time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf 
10
+time ./pyfll/fll ${options}  ${aptcache} -c ${confpath}${flavour}_${release}_${arch}.conf

Loading…
Cancel
Save