Merge lp:~jeffmarcom/opencompute/symlink-bug-fix-1230365 into lp:opencompute/checkbox

[Jeff Marcom]

Added a simple check to bypass the symlink creation in an Ubuntu based release.

The symlink only needs to be created in a Centos environment,

This adds a simple check to bypass the symlink creation in an Ubuntu based release.

[Jeff Lane  (bladernr)]

Not sure if you care about this or not (functionally it works either way) but

grep -q "Ubuntu" /etc/issue
if [ $? -ne 0 ] && [ ! -L /etc/checkbox.d/configs ]

Can be expressed:
if ( grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]

As long as you're fine with it as is, I'll approve it, but I thought I'd at least make the comment

review: Needs Information

[lp:~jeffmarcom/opencompute/symlink-bug-fix-1230365]

2153. By Jeff Marcom on 2013-09-26

Updated symlink condition expression based on feedback

Signed-off-by: Jeff Marcom <email address hidden>

[Jeff Marcom (jeffmarcom)]

> Not sure if you care about this or not (functionally it works either way) but
>
> grep -q "Ubuntu" /etc/issue
> if [ $? -ne 0 ] && [ ! -L /etc/checkbox.d/configs ]
>
> Can be expressed:
> if ( grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
>
> As long as you're fine with it as is, I'll approve it, but I thought I'd at
> least make the comment

Totally! Thanks

[Jeff Lane  (bladernr)]

approve.

review: Approve

=== modified file 'bin/checkbox-ocp-cli'
--- bin/checkbox-ocp-cli	2013-09-24 02:42:59 +0000
+++ bin/checkbox-ocp-cli	2013-09-26 16:06:36 +0000
@@ -6,7 +6,7 @@
 export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
-if [ ! -s /etc/checkbox.d/configs ]
+if ( grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
 then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
 fi
 
 
=== modified file 'bin/checkbox-ocp-gtk'
--- bin/checkbox-ocp-gtk	2013-09-24 02:42:59 +0000
+++ bin/checkbox-ocp-gtk	2013-09-26 16:06:36 +0000
@@ -6,6 +6,10 @@
 export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
+if ( grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
 if [ $CHECKBOX_DATA != '.' ]
 then
     old_data=$HOME/.checkbox
 
=== modified file 'bin/checkbox-ocp-qt'
--- bin/checkbox-ocp-qt	2013-09-24 02:42:59 +0000
+++ bin/checkbox-ocp-qt	2013-09-26 16:06:36 +0000
@@ -1,14 +1,15 @@
 #!/bin/bash
 
-set -e
-
 export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
 export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
 export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
-export CHECKBOX_FRONTEND=${CHECKBOX_FRONTEND:-$CHECKBOX_SHARE/qt/frontend}
 export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
+if ( grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
 if [ $CHECKBOX_DATA != '.' ]
 then
     old_data=$HOME/.checkbox
@@ -18,9 +19,4 @@
     fi
 fi
 
-if [ -e $CHECKBOX_FRONTEND ]
-then
-    (cd $CHECKBOX_FRONTEND; qmake; make; ./checkbox-qt-service &)
-fi
-
 python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== modified file 'bin/checkbox-ocp-urwid'
--- bin/checkbox-ocp-urwid	2013-09-24 02:42:59 +0000
+++ bin/checkbox-ocp-urwid	2013-09-26 16:06:36 +0000
@@ -6,6 +6,10 @@
 export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
 export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
 
+if ( grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
 if [ $CHECKBOX_DATA != '.' ]
 then
     old_data=$HOME/.checkbox