Skip to content

Commit c60c658

Browse files
committed
Minor fixes
1 parent 4c84bb5 commit c60c658

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

modules/1-install_jetson/1-install_jetson.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@ script_check()
5353
return 1
5454
}
5555

56+
script_info()
57+
{
58+
script_check
59+
60+
if [ $? -eq 1 ] ; then
61+
local info_je=$(jetson_release)
62+
local je_version=$(echo $info_je | grep -Po '(?<=Jetson Easy v)[^;]+' )
63+
echo " - Update jetson_easy from $je_version to $JETSON_EASY_VERSION"
64+
fi
65+
}
66+
5667
script_run()
5768
{
5869
tput setaf 6

modules/7-set_git/7-set_git.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ script_load_default()
110110

111111
script_save()
112112
{
113-
if [ ! -z ${NEW_GIT_USERNAME+x} ] ; then
113+
if [ ! -z ${NEW_GIT_USERNAME+x} ] && [ ! -z $NEW_GIT_USERNAME ] ; then
114114
# if [ NEW_GIT_USERNAME != $(git config user.name) ] ; then
115115
echo "NEW_GIT_USERNAME=\"$NEW_GIT_USERNAME\"" >> $1
116116
# fi
117117
fi
118-
if [ ! -z ${NEW_GIT_EMAIL+x} ] ; then
118+
if [ ! -z ${NEW_GIT_EMAIL+x} ] && [ ! -z $NEW_GIT_EMAIL ] ; then
119119
echo "NEW_GIT_EMAIL=\"$NEW_GIT_EMAIL\"" >> $1
120120
fi
121121
}
@@ -136,12 +136,9 @@ script_info()
136136

137137
set_user_name()
138138
{
139-
# Load default user
140-
script_load_user
141-
142139
local NEW_GIT_USERNAME_TMP_VALUE
143140
NEW_GIT_USERNAME_TMP_VALUE=$(whiptail --inputbox "$MODULE_NAME - Set user name" 8 78 $NEW_GIT_USERNAME --title "Set user.name" 3>&1 1>&2 2>&3)
144-
exitstatus=$?
141+
local exitstatus=$?
145142
if [ $exitstatus = 0 ] ; then
146143
# Write the new workspace
147144
NEW_GIT_USERNAME=$NEW_GIT_USERNAME_TMP_VALUE
@@ -150,12 +147,9 @@ set_user_name()
150147

151148
set_email()
152149
{
153-
# Load default email
154-
script_load_email
155-
156150
local NEW_GIT_EMAIL_TMP_VALUE
157151
NEW_GIT_EMAIL_TMP_VALUE=$(whiptail --inputbox "$MODULE_NAME - Set user email" 8 78 $NEW_GIT_EMAIL --title "Set user.email" 3>&1 1>&2 2>&3)
158-
exitstatus=$?
152+
local exitstatus=$?
159153
if [ $exitstatus = 0 ]; then
160154
# Write the new workspace
161155
NEW_GIT_EMAIL=$NEW_GIT_EMAIL_TMP_VALUE

modules/9-deeplearning/9-deeplearning.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,7 @@ script_save()
292292
fi
293293

294294
if [ ! -z ${DP_FOLDER+x} ] ; then
295-
if [ $DP_FOLDER != "\"\"" ]
296-
then
295+
if [ $DP_FOLDER != "\"\"" ] ; then
297296
echo "DP_FOLDER=\"$DP_FOLDER\"" >> $1
298297
fi
299298
fi

0 commit comments

Comments
 (0)