rebase master

Makefile

@@ -1,3 +1,5 @@
+-include $(if $(MYOS),$(MYOS),../myos)/make/include.mk
+
 tests: ~/.zen/secret.june shellcheck-specs shellspec-specs
 
 shellcheck-%:

include.sh

@@ -1,10 +1,9 @@
 #!/bin/sh
 
 check_requirements() {
-  return 0
   sudo apt-get update
   sudo apt-get install git fail2ban inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel python3-dotenv mpack libssl-dev libffi-dev -y
-  sudo apt-get install build-essential qrencode jq bc gawk ffmpeg sqlite dnsutils v4l-utils vlc mp3info musl-dev openssl* cargo detox httrack -y
+  sudo apt-get install build-essential qrencode jq bc gawk ffmpeg sqlite dnsutils v4l-utils vlc mp3info musl-dev openssl* cargo detox httrack sudo -y
   [[ ! $(which kodi) && "$USER" != "xbian" ]] && sudo apt-get install kodi -y
   sudo apt-get install python3-opencv -y
   [[ "$USER" != "xbian" ]] && sudo apt-get install x11-utils zenity handbrake* -y
@@ -33,35 +32,29 @@ i_should_install() {
 }
 
 import_astrXbian() {
-  return 0
   mkdir -p ~/.zen
   cd ~/.zen
   git clone https://git.p2p.legal/axiom-team/astrXbian.git
 }
 
 import_ipfs() {
-  return 0
   ~/.zen/astrXbian/.install/ipfs_alone.sh
 }
 
 import_jaklis() {
-  return 0
   cd ~/.zen/astrXbian/zen/jaklis
   ./setup.sh
 }
 
 import_kodi() {
-  return 0
   cp -Rf ~/.zen/astrXbian/.install/.kodi ~/
 }
 
 iso_config() {
-  return 0
   ~/.zen/astrXbian/ISOconfig.sh
 }
 
 prepare_next_boot() {
-  return 0
   ## Rpi Xbian install. 
   cat /etc/rc.local | grep -Ev "exit 0" > /tmp/new.rc.local ## REMOVE "exit 0"
   # PREPARE NEXT BOOT - Network config - NEXTBOOT - ISOConfig - NEXTBOOT - OK

specs/astrXbian_spec.sh

@@ -11,43 +11,43 @@ Describe 'AstrXbian'
       When call i_am_root
       The status should not be success
     End
-    It 'should check I allow install'
+    It 'should check I need to install'
       When call i_should_install
       The status should be success
     End
     It 'should check requirements, but not tested'
-      Pending "You should implement check_requirements tests"
+      Skip "You should implement check_requirements tests"
-      When call check_requirements
+      When run check_requirements
       The status should be success
     End
     It 'should import AstrXbian, but not tested'
-      Pending "You should implement import_astrXbian tests"
+      Skip "You should implement import_astrXbian tests"
-      When call import_astrXbian
+      When run import_astrXbian
       The status should be success
     End
     It 'should import Kodi, but not tested'
-      Pending "You should implement import_kodi tests"
+      Skip "You should implement import_kodi tests"
-      When call import_kodi
+      When run import_kodi
       The status should be success
     End
     It 'should import IPFS, but not tested'
-      Pending "You should implement import_ipfs tests"
+      Skip "You should implement import_ipfs tests"
-      When call import_ipfs
+      When run import_ipfs
       The status should be success
     End
     It 'should import Jaklis, but not tested'
-      Pending "You should implement import_jaklis tests"
+      Skip "You should implement import_jaklis tests"
-      When call import_jaklis
+      When run import_jaklis
       The status should be success
     End
     It 'should create astrXbian id, but not tested'
-      Pending "You should implement iso_config tests"
+      Skip "You should implement iso_config tests"
-      When call iso_config
+      When run iso_config
       The status should be success
     End
     It 'should prepare astrXbian for first boot, but not tested'
-      Pending "You should implement prepare_next_boot tests"
+      Skip "You should implement prepare_next_boot tests"
-      When call prepare_next_boot
+      When run prepare_next_boot
       The status should be success
     End
   End